merged make_torrent fixes from RC_0_16
merged make_torrent fixes from RC_0_16

deluge-clone/libtorrent,deluge-clone/libtorrent,deluge-clone/libtorrent,deluge-clone/libtorrent,deluge-clone/libtorrent,deluge-clone/libtorrent