Merged revisions 169867 via svnmerge from