initial commit of pull #1044 to meter repo

Modification for https://github.com/rapid7/metasploit-framework/pull/1044