Merge branch 'master' into dependency-updates

Conflicts:
	Gemfile.lock