work dammit
Merge remote-tracking branch 'origin/cassandra' into cassandra