If ":run_all => { :parallel => true }" is present but ":parallel => true" is not, then only run in parallel when running all specs.
Merge branch 'develop'