use -f d to rspec
Merge remote-tracking branch 'origin/master' into ubuntu