Merge branch 'master' of /tmp/tmp.qmWbjO3vZi into pgadmin4.xml

pgadmin4.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--  vim: set softtabstop=3: -->
+<packages>
+  <package id="pgadmin4" name="pgAdmin 4" revision="%version%.1" priority="0" reboot="false">
+    <variable name="majorversion" value="4" />
+    <variable name="minorversion" value="14" />
+    <variable name="version" value="%majorversion%.%minorversion%" />
+
+    <depends package-id="vs2013x86runtime" />
+
+    <check type="uninstall" condition="exists" path="pgAdmin 4 version %version%" />
+
+    <install cmd='%software%\pgadmin\pgadmin4-%version%-x86.exe /SP- /VERYSILENT /SUPPRESSMSGBOXES /NORESTART' />
+    <install cmd='cmd /c copy %software%\pgadmin\config_local.py "%programfileswpkg%\pgadmin 4\v%majorversion%\web\"' />
+
+    <upgrade include='remove' />
+    <upgrade include='install' />
+
+    <!-- remove our config file: the uninstaller does not, and thus also leaves the directory tree behind -->
+    <remove cmd='cmd /c del "%programfileswpkg%\pgadmin 4\v%majorversion%\web\config_local.py"'>
+      <exit code='any'/>
+    </remove>
+    <remove cmd='"%programfileswpkg%\pgadmin 4\v%majorversion%\unins000.exe" /VERYSILENT /SP- /NORESTART' />
+
+  </package>
+</packages>