Support Spark 1.1.1