Merged revisions 168267 via svnmerge from