Merged revisions 167299 via svnmerge from