Merge the latest from spark:master