refs #2036: added changelog entries for next release
Merge branch 'gh-pages' into newbase