[openshot/f28: 2/2] Merge branch 'master' into f28