Merge Spark master in preparation for release

I encountered a mysterious bug documented and fixed in 824316432a8fc7f296904c14463e2c0767060e36.