Update

Pull merged requests from nlog/v4.0