new option and scheduler
Merge remote-tracking branch 'refs/remotes/upstream/master' into distributed-testrunner