Merge branch 'master' of github.com:apache/spark into configure-ports