Merge upstream.

Merge upstream with fixes to make it point correctly to Spree master
branch.