Merge branch 'master' of https://github.com/spark/docs
Merge branch 'master' into gh-pages