Merge branch 'bug-1061' into testserver-stable