Merged revisions 320796 via svnmerge from