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