Merge branch 'torrent-quick-fixes'
use underscores during rename and move
Merge remote-tracking branch 'bakie/feature/use_underscores' into develop