Merge conflicts from commits that Igore sneakily added without telling me.
    
    I mean, RHEL 8 isn't even going to be released for a while yet. But
    okay, sure, explicitly compiling glib schemas *might* not be necessary
    anymore when 8 eventually comes out.