typo in date fixed in changelog
Merge branch 'master' into development