Merged revisions 277327 via svnmerge from