[openshot/f35: 5/5] Merge branch 'master' into f35