Update changelog
New build
Merge branch 'master' into gh-pages