Forgot the stress tests
Merge branch 'master' into gh-pages