Merged revisions 178508 via svnmerge from