[openshot] (7 commits) ...Merge branch 'el7'