Merged revisions 336792 via svnmerge from