Merge branch 'bug-775' into testserver-stable