Merged revisions 323040 via svnmerge from