Fix #843 by casting pool_size prior to min
Fix up pool_size sourcing logic re: @parallel
Merge branch '1.5'