merged fixes
merged fixes

git-svn-id: f67b0ceb3350ef0edbc0db4d68e0a5bd36ca1541@6628 f43f7eb3-cfe1-5f9d-1b5f-e45aa6702bda

steeve/libtorrent,steeve/libtorrent,steeve/libtorrent,steeve/libtorrent,steeve/libtorrent,steeve/libtorrent