merged fix from RC_1_0
merged fix from RC_1_0
mrmichalis/libtorrent-code,mrmichalis/libtorrent-code,mrmichalis/libtorrent-code,mrmichalis/libtorrent-code,mrmichalis/libtorrent-code,mrmichalis/libtorrent-code