Update changelog and revision number
Merge branch 'master' into dev