Fix for #158.

5 jobs for master in 18 minutes and 54 seconds (queued for 2 seconds)