Misc changes
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0