From: Helge Norberg <helge.norberg@svt.se>
Date: Fri, 19 Aug 2016 13:58:17 +0000 (+0200)
Subject: Merge branch '2.1.0' of https://github.com/CasparCG/Server into 2.1.0
X-Git-Tag: 2.1.0_Beta1~65
X-Git-Url: https://git.sesse.net/?p=casparcg;a=commitdiff_plain;h=e75624659ed539334f9c83a99404c20206df76e3

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

e75624659ed539334f9c83a99404c20206df76e3