e7a4ee637a
Conflicts: lib/msf/core/payload/windows/bind_tcp.rb modules/payloads/stagers/windows/bind_tcp.rb Cherry-picked form @hmoore-r7's repo.