This is a combination of 169 commits.
Merge branch 'master' into gh-pages