Compatible with Spark-0.8.1-incubating-SNAPSHOT @3db505c21f