Merge branch 'dev'
A couple of final copy-adjustments before release.
Merge branch 'bugfix/copy-updates-before-deploying' into dev