Merge remote-tracking branch 'upstream/v3' into v3

Conflicts:
	lib/iron_mq/messages.rb