Protection against bad concurrency / thread count values.
Merge remote-tracking branch 'origin/master'