Merged revisions 321436 via svnmerge from