merged fix from trunk
merged fix from trunk

git-svn-id: f73d3a8135a81ac54074f42e0d79c0ba7e35ca85@6924 a83610d8-ad2a-0410-a6ab-fc0612d85776

svn2github/libtorrent-rasterbar-RC_0_16,svn2github/libtorrent-rasterbar-RC_0_16,svn2github/libtorrent-rasterbar-RC_0_16,svn2github/libtorrent-rasterbar-RC_0_16,svn2github/libtorrent-rasterbar-RC_0_16,svn2github/libtorrent-rasterbar-RC_0_16