Merge pull request #1060 from nZEDb/dev

Dev to Master - Please read the Changelog
Merge pull request #1062 from nZEDb/dev

Dev to Master - Please read the Changelog
Merge pull request #1063 from nZEDb/dev

Dev
merge error
Merge branch 'master' of https://github.com/nZEDb/nZEDb into dev