[xine-lib/f31: 6/6] Merge branch 'master' into f31