Merged revisions 318919 via svnmerge from