Merged revisions 56055 via svnmerge from