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