Merge branch 'bug-649' into testserver-stable