Merge branch 'dev'
typo
Merge branch 'master' of github.com:nZEDb/nZEDb
Merge branch 'dev'