[kmediafactory/el7] (9 commits) ...Merge branch 'master' into el7