Merge auto; branches 'master' and 'master' of github.com:geo2tag/core
GT-810