Change warning/error logging levels for a few bits and pieces.
Merge remote-tracking branch 'origin/master'