Merge branch 'master' of git://git.apache.org/spark into spark-sql-dsl-improvement2
Merge branch 'spark-sql-dsl-improvement2' of github.com:sarutak/spark into spark-sql-dsl-improvement2