Merge remote-tracking branch 'upstream/trunk' into trunk
Merge branch 'trunk' of https://github.com/eric-wu/cassandra into trunk