Merge branch 'master' of https://github.com/jp9000/obs-studio into Opt
Merge branch 'Opt' of https://github.com/antihax/obs-studio into Opt