Changelog added
Merge branch 'master' into 'orm'