Merge branch 'bug/rm7680-psexec_command-convert-nil-into-integer' of github.com:lmercer-r7/metasploit-framework into lmercer-r7-bug/rm7680-psexec_command-convert-nil-into-integer
Merge branch 'master' of github.com:rapid7/metasploit-framework into rapid7
Merge branch 'rapid7' into feature/stage_encoding
Deal with alread-normalized ints

[See #1308][See #1304]
Don't bother nil check, to_s handles it
Merge branch 'bug/optint_empty' into feature/stage_encoding
changes to address scriptjunkie's rpc concerns

as described in https://github.com/rapid7/metasploit-framework/pull/820
avoid begin rescue blocks
Msfupdate should check for installation validity

This fix will allow people to at least solve their own msfupdate
problems by registering for Community Edition.

[SeeRM #7690]
Add the optional pause for Windows
Merge remote-tracking branch 'wchen-r7/fail_to_reload_fix'
Merge remote-tracking branch 'wchen-r7/irb_terminatelineinput'
Nagios3 history.cgi exploit
Merge branch 'master' of git://github.com/rapid7/metasploit-framework
Move encoding into handle_connection

* Allows payloads that override generate_stage to still take advantage
  of stage encoding
* Also adds doc comments for a few methods
Return symbols

STOP_ON_SUCCESS is being ignored because the module's login function
doesn't pass a symbol to the mixin.  This addresses that.
Cosmetic changes
Merge branch 'bulletproof_ftp_creds' of github.com:jvazquez-r7/metasploit-framework into jvazquez-r7-bulletproof_ftp_creds
For consistency with other post modules, also do a store_loot
Merge branch 'add_bap_to_itms_overflow' of github.com:jvennix-r7/metasploit-framework into jvennix-r7-add_bap_to_itms_overflow