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