merge in one-time stripe script
Merge branch 'master' into pay