Yes - does this work for you?:

https://github.com/apache/spark/pull/730/files