[libopenshot-audio/el7] (16 commits) ...Fix conflicts with master.