Merge branch 'master' into cassandra-test