[kmediafactory/el7: 9/9] Merge branch 'master' into el7