Merge commit '45752394e4536dc708cb7742e239e7c2656eb6b7' into sub-stripe2

Conflicts:
	sites/all/modules/stripe/README.txt
test change 1 to main repo
tiny non-breaking visible change