Fix intermittent error with credit card form submission
Merge branch 'ziggos-master' into variants