Merged revisions 171689 via svnmerge from