merged module manager and logger updates
Merge remote-tracking branch 'origin/master'