fixes fast payment issue
Merge branch 'master' into pearly-tea