Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15218 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15219 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15220 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15221 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15222 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15223 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15224 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15225 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15226 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15227 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15228 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15229 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15230 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15231 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15232 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15233 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15234 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15235 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15236 4d416f70-5f16-0410-b530-b9f4589650da
Merge branch 'master' of github.com:rapid7/metasploit-framework into HEAD

git-svn-id: https://www.metasploit.com/svn/framework3/trunk@15237 4d416f70-5f16-0410-b530-b9f4589650da