merged build fix without exceptions from RC_0_16
merged build fix without exceptions from RC_0_16

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