Merge branch 'bug-1360' into testserver-stable