[libopenshot: 3/4] Merge branch 'el7'