Trunk

pull cassandra's commit for update