[mythweb/el7] (2 commits) ...Merge branch 'el7'