Synchronizing with latest master branch of CasparCG