Allow failures on rbx (timeout issue)
Merge branch 'master' into mutant-flexible-rspec