cleanup
CHANGES
merge
Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0