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