GT-862 fixes
Merge branch 'master' of github.com:geo2tag/automation