[xine-lib: 9/9] Merge branch 'el7'