manually merged 4a2171b from master
manually merged 0c06544 from master
manually merged 8d99a50 from master
manually merged a72be89 from master
Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0

Conflicts:
	core/consumer/output.h
	core/monitor/monitor.h
	core/producer/layer.h
	core/producer/stage.h
	core/video_channel.h
	core/video_format.cpp
	shell/server.h