Checked that tests work.
Merge branch 'master' into gh-pages
merge