Merge remote-tracking branch 'upstream/master'
smart_payload_inject, pentest plugin
Merge branch 'master' of github:ausec/metasploit-framework