Fix windows link error on names conflict with libtorrent
Merge branch 'develop' into kad