Merge branch 'master' of https://github.com/asiainfo-linkage/spark_dev
Merge branch 'master' of https://github.com/asiainfo-linkage/spark_dev