Merged revisions 173967-173968 via svnmerge from