merge fixes from RC_1_0
merge fixes from RC_1_0
mrmichalis/libtorrent-code,mrmichalis/libtorrent-code,mrmichalis/libtorrent-code,mrmichalis/libtorrent-code,mrmichalis/libtorrent-code,mrmichalis/libtorrent-code