Merged revisions 51211 via svnmerge from