.
Merge branch 'master' of https://github.com/oveo/mt-s3-reader

Conflicts:
	src/test/java/org/oveo/mt/S3ServiceMockConf.java