Add option to deny jockey spawn
Merge remote-tracking branch 'origin/master'