[pull] master from rapid7:master#335

pull[bot] merged 5 commits intom-1-k-3:masterm-1-k-3/metasploit-framework:masterfrom

rapid7:masterrapid7/metasploit-framework:masterCopy head branch name to clipboard