Merged revisions 56008 via svnmerge from