Updated change log
Merge branch 'master' into api-user