Conflicts: spec/lib/msf/core/module_spec.rb
This should not affect core Metasploit Framework as it only updates gems in the test group (and dependencies of those gems).