[avidemux/f33: 5/5] Merge branch 'master' into f33