re-add some changes.
Merge branch 'master' into gh-pages