Merge pull request #1923 from hnyman/libtorrent