Sync with latest fedoraproject changes.