Update from cassandra 1.2.9