Initial commit
Merge remote-tracking branch 'upstream/master' into upgrade_psh

Conflicts:
	lib/msf/core/post/file.rb
Land #2936 - Windows Command Shell Upgrade (Powershell)