Deadlock debugging/prevention
Merge branch 'master' of github.com:danielsmith-eu/webbox