Update text in warning class
Merge branch 'news-update'
Merge branch 'master' into gh-pages