Merged revisions 318917 via svnmerge from