Manually merged 0edf4e5 (excluding changes to ffmpeg) from master
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

Conflicts:
	modules/image/producer/image_producer.cpp