update .mailmap so 'git shortlog' is prettier
include function name in errors about invalid l...
fix test for bug-351
allow using optional arguments in DEFERR handlers
additional tests