Merged revisions 322069 via svnmerge from