Merge branch 'devel' into release-1.7

packages/boilerplate-generator/generator.js

@@ -44,7 +44,7 @@ export class Boilerplate {
     }
 
     // Calling .await() requires a Fiber.
-    return toHTMLAsync(extraData).await();
+    return this.toHTMLAsync(extraData).await();
   }
 
   // Returns a Promise that resolves to a string of HTML.

packages/minifier-js/minifier.js

@@ -15,6 +15,11 @@ meteorJsMinify = function (source) {
         global_defs: {
           "process.env.NODE_ENV": NODE_ENV
         }
+      },
+      mangle: {
+        // Fix issue #9866, as explained in this comment:
+        // https://github.com/mishoo/UglifyJS2/issues/1753#issuecomment-324814782
+        safari10: true
       }
     });
 

packages/minifier-js/package.js

@@ -1,6 +1,6 @@
 Package.describe({
   summary: "JavaScript minifier",
-  version: "2.3.4"
+  version: "2.3.5"
 });
 
 Npm.depends({

packages/standard-minifier-js/package.js

@@ -1,6 +1,6 @@
 Package.describe({
   name: 'standard-minifier-js',
-  version: '2.3.3',
+  version: '2.3.4',
   summary: 'Standard javascript minifiers used with Meteor apps by default.',
   documentation: 'README.md',
 });