Merged revisions 174218 via svnmerge from