Sync with irungentoo/toxcore