r4951 release update.
Merge branch 'master' into gh-pages