[libopenshot] (4 commits) ...Merge branch 'el7'