Fix build
Fix build
Merge commit '4b6d6ebd8cb613d1975ef3fc6e7ba4218143364c' into cassandra-2.1.0