Merge branch 'develop_iptorrents' into develop_testing
Merge branch 'feature/dev_rtorrent' into develop_testing