Fixed building on Windows
Merge branch 'master' of https://github.com/spark/spark-dev