Merge branch 'feature/dev_rtorrent' into develop_testing