Merge remote-tracking branch 'upstream/spark' into spark
Merge branch 'spark' of https://github.com/chengxiangli/hive into spark