Merged revisions 54884 via svnmerge from