Dropped a hyphen in the title
Land #3800, release fixes
Merge branch 'master' of github.com:rapid7/metasploit-framework