Merge remote-tracking branch 'refs/remotes/upstream/develop'

Conflicts:
	contrib/lang/scala/README.md