Merge branch '2-2-wip-jdutil' into 2-2-stable
Merge branch 'master' into 2-2-stable
Bump to Spree's master branch (2.3.0.beta).