Merged revisions 318550 via svnmerge from