manually adding bug fixes/changes by bblanchon - merge requests go through dev branch
Merge branch 'master' of github.com:nZEDb/nZEDb