less logging
scripted update of code from master at 76b0956 less logging