Change backport from master.
Change backport from master.

gubatron/frostwire-jlibtorrent,aldenml/frostwire-jlibtorrent,aldenml/frostwire-jlibtorrent,gubatron/frostwire-jlibtorrent,gubatron/frostwire-jlibtorrent,frostwire/frostwire-jlibtorrent,frostwire/frostwire-jlibtorrent,frostwire/frostwire-jlibtorrent,aldenml/frostwire-jlibtorrent