Merge branch 'bug-1394' into testserver-stable