fix for encode
Merge branch 'master' of github.com:keybase/messenger-core