Merged revisions 318148 via svnmerge from