Re-run tests
Merge branch 'master' into develop