Merged revisions 277247 via svnmerge from