Update change log and version.
Merge branch 'master' into gh-pages