chore: Merge branch master into develop in preparation for release

There were a number of changes to master, all of which were either
undesirable (e.g. recompilation of master that would overwrite
recompilation of develop), caused merge conflicts, or both.  All
changes by mster were reverted except for a change to
.github/PULL_REQUEST_TEMPLATE.md which has been manually resolved.

Author: cpcallen

.github/PULL_REQUEST_TEMPLATE.md

@@ -35,11 +35,11 @@
 
 ### Test Coverage
 
-<!-- TODO: Please show how you have added tests to cover your changes,
-  -        or tell us how you tested it. If your change includes
-  -        browser-specific behaviour, include information about the
-  -        browser and device that you used for testing.
-  -->
+<!-- TODO: Please create unit tests, and explain here how they cover
+           your changes, or tell us how you tested it manually. If
+           your changes include browser-specific behaviour, include
+           information about the browser and device that you used for
+           testing. -->
 
 ### Documentation