Merge branch 'DariusIII-dev' into dev
merge pr #1331
fix changelof merge error
Merge pull request #624 from nZEDb/dev

Dev