hofix updates on test server
Merge branch 'master' of ssh://github.com/cdparra/elder.tl