Merged revisions 172517 via svnmerge from