Merged revisions 318337 via svnmerge from