Merged revisions 56457 via svnmerge from