Merge remote-tracking branch 'apache-github/master' into state-cleanup
Merge branch 'state-cleanup' of github.com:tdas/spark into cleanup