Merged revisions 318233 via svnmerge from