Fix censoring of stack traces not actually being taken into account.
Truly fix #377.
Merge branch 'v3' into watcher