Merged revisions 51409 via svnmerge from