Merged revisions 320568 via svnmerge from