don't mention unneeded token escaping
Merge branch 'cassandra-2.1' into trunk