Merge branch 'master' into 6.4.x

Merging all non-StudioProjectCompat work into the 6.4.x branch for
possible 6.x, or 6.4.x work in the future.

bin/templates/project/assets/www/cordova.js

@@ -19,7 +19,7 @@
  under the License.
 */
 ;(function() {
-var PLATFORM_VERSION_BUILD_LABEL = '6.4.0';
+var PLATFORM_VERSION_BUILD_LABEL = '6.4.1-dev';
 // file: src/scripts/require.js
 
 /* jshint -W079 */
@@ -2185,4 +2185,4 @@ window.cordova = require('cordova');
 
 require('cordova/init');
 
-})();
+})();