Cassandra1.0 tlp merge

Merges in Pattern and Matcher changes only.