[mythweb/el7: 7/7] Merge branch 'master' into el7