IntelliJ
Merge commit '8e146e77f5c994cf451dc8dad3ce232eaa9990e4'

Conflicts:
	stripe/Stripe.iml