Make Cassandra version requirement explicit
Merge remote-tracking branch 'upstream/master'