Merged revisions 54103 via svnmerge from