diff --git a/CHANGELOG b/CHANGELOG
index d73cb34e21300770ab0972c6d819af86acaa575a..641290a040742f399e7d1e3a856ef8a43f43fdd3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,9 +3,9 @@ minerva (12.0.1) stable; urgency=medium
   * Bug fix: opened submap had different background then current selection
   * Bug fix: clicking on comments was difficult in OpenLayers
   * Bug fix: general map comment didn't display coordinates properly
-  * Bug fix: opening could crash when CellDesigner file contained duplicate 
+  * Bug fix: opening could crash when CellDesigner file contained duplicate
     reaction id
-  
+
  -- Piotr Gawron <piotr.gawron@uni.lu>  Wed, 21 Jul 2018 18:00:00 +0200
 
 minerva (12.0.0) stable; urgency=medium
@@ -77,6 +77,14 @@ minerva (12.0.0) stable; urgency=medium
 
  -- Piotr Gawron <piotr.gawron@uni.lu>  Mon, 16 Jul 2018 12:00:00 +0200
 
+minerva (11.1.3) stable; urgency=medium
+  * Bug fix RPM: remove directory with contents of unpacked war file
+    when uninstalling
+  * Bug fix: don't append Google API key to Google maps javascript URL
+    when it is not set
+
+ -- Piotr Gawron <piotr.gawron@uni.lu>  Mon, 23 Jul 2018 12:00:00 +0200
+
 minerva (11.1.2) stable; urgency=medium
   * Bug fix: Searching for chemicals with invalid mesh ID crashed
   * Bug fix: opening map that was removed and re-uploaded could crash
diff --git a/frontend-js/src/main/js/minerva.js b/frontend-js/src/main/js/minerva.js
index f14b4795e068c5221acb7deaeba2379a13e1165d..8a5570401657857cd9c6d0f53cc7920d16e49b28 100644
--- a/frontend-js/src/main/js/minerva.js
+++ b/frontend-js/src/main/js/minerva.js
@@ -308,7 +308,11 @@ function create(params) {
     params.setProject(project);
     var promise = Promise.resolve();
     if (params.getProject().getMapCanvasType() === "GOOGLE_MAPS_API") {
-      promise = functions.loadScript("https://maps.google.com/maps/api/js?libraries=drawing&key=" + params.getConfiguration().getOption(ConfigurationType.GOOGLE_MAPS_API_KEY).getValue());
+      var apiKeySuffixString = '';
+      if (params.getConfiguration().getOption(ConfigurationType.GOOGLE_MAPS_API_KEY).getValue()) {
+        apiKeySuffixString = '&key=' + params.getConfiguration().getOption(ConfigurationType.GOOGLE_MAPS_API_KEY).getValue();
+      }
+      promise = functions.loadScript("https://maps.google.com/maps/api/js?libraries=drawing" + apiKeySuffixString);
     }
     return promise;
   }).then(function () {
diff --git a/persist/src/db/11.1.3/fix_db_20180723.sql b/persist/src/db/11.1.3/fix_db_20180723.sql
new file mode 100644
index 0000000000000000000000000000000000000000..a33b6ad89d4881c84fb355b8c56d309760e66b70
--- /dev/null
+++ b/persist/src/db/11.1.3/fix_db_20180723.sql
@@ -0,0 +1 @@
+-- empty file to force directory to be commited to git repo
diff --git a/rpm/minerva.spec.in b/rpm/minerva.spec.in
index 2edcdf292154137850bb234c22e28361f72d51ac..99556fd49b92b3e7868ec55af2518d670e67c693 100644
--- a/rpm/minerva.spec.in
+++ b/rpm/minerva.spec.in
@@ -41,10 +41,12 @@ if ! su - postgres -c "psql --dbname map_viewer -q -c '\q'" 2> /dev/null; then
 fi
 
 %preun -p /bin/bash
-# save version information of the old package to make sure we run the correct DB-update script after installation
 if [ $1 == 1 ]; then
+    # save version information of the old package to make sure we run the correct DB-update script after installation
     mkdir -p %{_sharedstatedir}/rpm-state/%{name}
     echo -n %{version} > %{_sharedstatedir}/rpm-state/%{name}/OLD_VERSION
+    # remove old unpacked ("exploded") directory of war file
+    rm -rf %{_sharedstatedir}/tomcat/webapps/%{name}
 fi
 
 %posttrans -p /bin/bash