Merge remote-tracking branch 'origin/master' into feature/gcs

# Conflicts:
#	webadmin/src/views/certs.js
#	webadmin/src/views/settings.js

package.json

@@ -18,11 +18,11 @@
     "@google-cloud/storage": "^1.2.1",
     "@sindresorhus/df": "^2.1.0",
     "async": "^2.6.0",
-    "aws-sdk": "^2.149.0",
+    "aws-sdk": "^2.151.0",
     "body-parser": "^1.18.2",
-    "cloudron-manifestformat": "^2.9.0",
+    "cloudron-manifestformat": "^2.10.0",
     "connect-ensure-login": "^0.1.1",
-    "connect-lastmile": "^0.1.0",
+    "connect-lastmile": "^1.0.2",
     "connect-timeout": "^1.9.0",
     "cookie-parser": "^1.3.5",
     "cookie-session": "^1.3.2",