No parallel execution of tests (fixes test failures due to missing database schema)
Merge remote-tracking branch 'origin/master'