Merge branch 'master' of github.com:shellster/metasploit-framework into shellster-master
Merge branch 'master' of git://github.com/rapid7/metasploit-framework
Add dlink pass for #1648
Land #1660, dlink backdoor wordlist

[Closes #1660][See #1648]