Merged revisions 321515 via svnmerge from