Merged revisions 336936 via svnmerge from