Merge Metasploit changes