[xine-lib/el7: 2/2] Merge remote-tracking branch 'origin/master' into el7