Merged revisions 320650 via svnmerge from