Merged revisions 56805 via svnmerge from