Merge branch 'master' of git://github.com/rapid7/metasploit-framework
Merge branch 'master' of github.com:wchen-r7/metasploit-framework