// parallelize again
Merge branch 'master' into travis
// sauce settings