Updated Changelog
Merge branch 'master' into sailfishos
Updated Changelog