Fix a typo in excepthook
Merge branch 'maint'