Merge branch 'bug-1318' into testserver-stable