fix #1104
Merge branch 'master' of https://github.com/dubslow/toxcore