Merged revisions 318055 via svnmerge from