Merge branch 'dev' of https://github.com/nZEDb/nZEDb into dev-Roelski-screenthreadfix
Merge branch 'dev-Roelski-screenthreadfix' of https://github.com/Roelski/nZEDb into dev-Roelski-screenthreadfix