Merged revisions 178804 via svnmerge from