Merge remote-tracking branch 'origin/bug-1301' into release
Merge branch 'release' into testserver-stable