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

How 'bout this fix, eh?