Merge branch 'master' into almodovar-multiplatform-client

Conflicts:
	Gemfile.r2.lock