Fix multi-line output due to bad regex flag
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fix a bug reported by Tom Liston
Merge branch 'master' of github.com:hmoore-r7/metasploit-framework into hmoore-r7-master