Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin/master' into exe-template-refactor
Merge branch 'exe-template-refactor' of https://github.com/shellster/metasploit-framework into exe-template-refactor