Fix crash in single-threaded mode
Merge branch 'master' into tax