Merged revisions 336717 via svnmerge from