Merge branch 'payments'
geoname
nilcheck
Merge branch 'master' into payments