Merge branch 'master' into develop

README.md

@@ -22,6 +22,8 @@ Want to contribute? Great! First, read [our guidelines for contributors](https:/
 
 ## Releases
 
+The next major release will be **June 26th, 2020**.
+
 We release by pushing the latest code to the master branch, followed by updating our [docs](https://developers.google.com/blockly) and [demo pages](https://blockly-demo.appspot.com). We typically release a new version of Blockly once a quarter (every 3 months). If there are breaking bugs, such as a crash when performing a standard action or a rendering issue that makes Blockly unusable, we will cherry-pick fixes to master between releases to fix them. The [releases page](https://github.com/google/blockly/releases) has a list of all releases.
 
 Releases are tagged by the release date (YYYYMMDD) with a leading '2.' and a trailing '.0' in case we ever need a major or minor version (such as [2.20190722.1](https://github.com/google/blockly/tree/2.20190722.1)). If you're using npm, you can install the ``blockly`` package on npm: 

core/options.js

@@ -324,8 +324,8 @@ Blockly.Options.parseThemeOptions_ = function(options) {
   } else if (theme instanceof Blockly.Theme) {
     return /** @type {!Blockly.Theme} */ (theme);
   }
-  return Blockly.Theme.defineTheme(
-      'builtin' + Blockly.utils.IdGenerator.getNextUniqueId(), theme);
+  return Blockly.Theme.defineTheme(theme.name ||
+      ('builtin' + Blockly.utils.IdGenerator.getNextUniqueId()), theme);
 };
 
 /**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockly",
-  "version": "3.20200402.0",
+  "version": "3.20200402.1",
   "description": "Blockly is a library for building visual programming editors.",
   "keywords": [
     "blockly"