Merge remote-tracking branch 'upstream/master' into sprint-to-release-fixup

Conflicts:
	tasks/build.js