Merge branch 'cassandra-1.1' into trunk