Merge changes from official stripe/stripe-php

Ummm. I meant to merge changes **from** stripe/stripe-php into my fork :(