better stacktracing on plugin hook listener failures
Merge branch 'master' due to failure to remember to rebase...