[x265/el7] (2 commits) ...Merge branch 'master' into el7