Merge remote-tracking branch 'upstream/master' into fix_sync_multiple

Conflicts:
	spec/interface_spec.rb
	spec/marketo_spec.rb