Merge pull request #1 from spark/master

Merge latest from spark:master