Sync with Spark master

Contains a very important bug fix for shuffle in commit 53b94ef.