Format module loader messages nicely
Merge remote-tracking branch 'origin/master'