MRQL-26: Support for Spark 0.8.1