Fix a minor bug with missing modules failing to collect
Merge remote-tracking branch 'origin/master'