Merged revisions 320823 via svnmerge from