Merged revisions 163253 via svnmerge from