Merged revisions 54969 via svnmerge from