Merged revisions 320237 via svnmerge from