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