Merging upstream

This merges the upstream @ https://github.com/lionelbarrow/braintree-go/commit/48b5309ebc759bcb0ff41dc62abf9c818a163bd3