Merge branch 'sb/mailmap-freeing-NULL-is-ok'