Merged revisions 277497 via svnmerge from