Merge branch 'master' into event-integration-tests

Conflicts:
	Gemfile
	Gemfile.lock
	spec/spec_helper.rb