Merge changelog from the fedora master branch