[openshot/f34] (5 commits) ...Merge branch 'master' into f35