syncing with tribler/dispersy/devel