Merge branch 'rj/mailmap-ramsay' * rj/mailmap-ramsay: mailmap: update my entry with new email address