Updated to apache/spark HEAD as of 08-20-2014