Merged revisions 51407 via svnmerge from