Merged revisions 187362 via svnmerge from