Merge branch 'am/mailmap-andrey-mazo'