Merge master into runners-spark2 branch to keep up-to-date

This closes #585