Post PR #26, dropping prerel

MSP-11372
Patch bump, PR 26

MSP-11372
Merge branch 'master' into feature/MSP-11385/autoload

MSP-11385

Conflicts:
	lib/metasploit/model/version.rb