Merge branch 'master' of github.com:rapid7/metasploit-framework
Merge branch 'master' into autoload