Merge branch 'bug-1282' into testserver-stable