Merged revisions 56094 via svnmerge from