[xine-lib/el7] (2 commits) ...Merge remote-tracking branch 'origin/master' into el7