[openshot/el7: 33/33] Merge branch 'el7'