Merged revisions 339145 via svnmerge from