Merged revisions 165889 via svnmerge from