[libopenshot/el7: 5/5] Merge branch 'el7'