Merge branch 'rj/mailmap-ramsay'