Merged revisions 339508 via svnmerge from