rapid7/metasploit-framework — pull request #2157 by wvu-r7 (2013-07-25 16:00:35+00:00)
Title: Resubmitting #2030 for @averagesecurityguy

I added a couple fixes. Should be ready to land.