Merge Spark master in preparation for release

I encountered a mysterious bug documented and fixed in 99cf724f3e5cb95008e958f25f01ded7d5c9083d.