GT-765 deploy
Merge branch '765-deadlock' of github.com:geo2tag/core into 765-deadlock