bundle update
Merge branch 'master' into features/session_export_as_json

Conflicts:
	Gemfile.lock