[x265/el7: 13/13] Merge branch 'master' into el7