2 1 stable

Same pull request https://github.com/spree/spree_gateway/pull/129 -- but for 2-1-stable