Merge branch 'dev' of github.com:nZEDb/nZEDb into dev