Better assertion error in the DefaultLogger
Merge remote-tracking branch 'origin/master'