[obs-studio/f25] (3 commits) ...fix merge