Merge branch 'feature/dev_rtorrent' into feature_testing