Fix spots where Sprint -> Release wasn't done properly
Merge remote-tracking branch 'upstream/master' into sprint-to-release-fixup

Conflicts:
	tasks/build.js
Merge pull request #466 from MarcelGerber/sprint-to-release-fixup

Fix spots where Sprint -> Release wasn't done properly