How 'bout this fix, eh?
closes #3388
Merge pull request #3390 from permcody/max_parallel

How 'bout this fix, eh?
Merge commit '7bdc29057de3ceff0df67da8235e3df95eb0f0a1'