Merge rossta:update_rspec_and_require_statements