Update .mailmap with a few more addresses Upstream-commit: 860ab469cc267097e243c634fdb59f7444eefea1 Component: engine