Merge remote-tracking branch 'origin/s3' into s3

Conflicts:
	build.sbt