Merged revisions 166509 via svnmerge from