Merge "Add Martin Urbanec to .mailmap"