Merged revisions 272446 via svnmerge from