Merged revisions 171187 via svnmerge from