Merge pull request #1135 from kevinmehall/parallel