Merged revisions 54204 via svnmerge from