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