[HandBrake/f29: 2/2] Merge branch 'f28' into f29