Sync qmule with libed2k
Merge develop into master