rapid7/metasploit-framework — pull request #4492 by bcook-r7 (2014-12-31 00:51:41+00:00)
Title: Land #3594 - updated PR rebased on latest

I squashed a few of the 'oops' commits and fixed some of the merge conflicts with master by doing a fresh rebase. This should make it a little easier to follow in the merge as well.