[libopenshot/el7] (5 commits) ...Merge branch 'el7'