more friendly logging
scripted update of code from master at 9303576 more friendly logging