Fix changelog and version for next release from master.
Merge pull request #498 from 4teamwork/lg-fix-changelog

Fix changelog and version for next release from master.