Merged revisions 55947 via svnmerge from