Merged revisions 188646 via svnmerge from