Merged revisions 173917 via svnmerge from