Temporary fix for endless module loop
Merge remote-tracking branch 'origin/master'