Updated to Spark 1.2.0