Fix build problems due to https://github.com/mesos/spark/pull/838
Merge pull request #132 from mateiz/build-fix

Fix build problems due to https://github.com/mesos/spark/pull/838