Update .mailmap and AUTHORS Upstream-commit: 9fbb134d87c9c0c045db6237f79f177280f5efc5 Component: engine