Merge pull request #1610 from armenb/armenb/loglevel_then_log_prefix