Merged revisions 188773 via svnmerge from