Fix module 'follows' disposal
Merge remote-tracking branch 'origin/master'