Merged revisions 336978 via svnmerge from