[openshot/el7: 32/33] git merge and squash master