[kdenlive/f25] (2 commits) ...Merge branch 'el7' into f25
Summary of changes:
bb36b0e... Merge branches 'master' and 'f20' into f20 (*)
1a8fc49... Merge branch 'el7' into f25
(*) This commit already existed in another branch; no separate mail sent