Merge latest from spark:master to v0.3.2