Merge branch 'upstream-master' into staging/electro-release
Removing ruby-version and -gemset from gitignore

These should not have been removed.
Restoring ruby and gemset files
Merge branch 'staging/electro-release' of github.com:shuckins-r7/metasploit-framework into staging/electro-release
Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release
Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release
Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release
Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release
Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release
Merge branch 'bug/MSP-10998/float-versions' into bug/MSP-10963/realm-uniqueness

MSP-10963
Update metasploit-credential

MSP-10963
Update metasploit-credential

MSP-10963
Merge branch 'staging/electro-release' of github.com:rapid7/metasploit-framework into staging/electro-release
Updating metasploit-credential dep to v0.8.6
Merge branch 'bug/MSP-10963/realm-uniqueness' into staging/electro-release