Merged revisions 174148 via svnmerge from