Bug 24430.  Upate readme
Merge branch 'mainline'