Added changelog changes proposed by Anna.
Sorted changelog entries.
Merge branch 'master' into major