Merge branch 'fedora' into master-merge