Merged revisions 51339 via svnmerge from