[gxine/el7] (7 commits) ...Merge remote-tracking branch 'origin/master' into el7