Port changes from https://github.com/UnityTech/active_merchant/compare/5b08e0c...96c9c35700
Merge pull request #1 from DarkFox/master

Port changes from UnityTech/active_merchant
Merge remote-tracking branch 'upstream/master'