Merge branch 'fixgenericcustom' of github.com:rsmudge/metasploit-framework into rsmudge-fixgenericcustom

Author: sinn3r

modules/payloads/singles/generic/custom.rb

@@ -38,6 +38,10 @@ def initialize(info = {})
 	# Construct the payload
 	#
 	def generate
+		if datastore['ARCH']
+			self.arch = actual_arch
+		end
+
 		if datastore['PAYLOADFILE']
 			IO.read(datastore['PAYLOADFILE'])
 		elsif datastore['PAYLOADSTR']