Merge branch 'master' into activex

Conflicts:
	lib/msf/core/exploit/exe.rb
	lib/msf/util/exe.rb