[openshot/f27] (12 commits) ...Merge branch 'master' into f27