Merge remote-tracking branch 'jlentfer/logwatch' into next