Fix Fedora dependencies (from glinject-next).
Merge branch 'master' into glinject-next