[kdenlive/f25: 2/2] Merge branch 'el7' into f25