Merge branch 'master' into contribution

Conflicts:
	Gemfile.lock