Merge branch 'master' into connectionpool

Conflicts:
	cassandra_snapshotter/main.py
	cassandra_snapshotter/snapshotting.py