Merged revisions 272255 via svnmerge from