checkout address changes
Merge branch '2-2-stable' of https://github.com/stronray/spree into 2-2-stable