SPARK-1064

This reopens PR 649 from incubator-spark against the new repo