Fixes a couple small issues with providerTokens used in payment
processing
Updated Version 3.1.11
Merge branch 'master' into develop

Conflicts:
	version.txt