Scrutinizer Fixes
Merge branch 'dev' into dev-taskym-misc
Merge Fix.
Merge branch 'dev-taskym-misc' of https://github.com/taskym/nZEDb into taskym-dev-taskym-misc
Merge branch 'taskym-dev-taskym-misc' into dev
Update changelog.