Flag to not run tests
Merge remote-tracking branch 'seed/master'