From: James Wise <james.wise@bluefish444.com>
Date: Wed, 8 Feb 2017 23:23:08 +0000 (+1100)
Subject: Merge commit '008e8dd2152b97abaf2b6c4f9ac385eb1e1d1d6e' into 2.1.0
X-Git-Tag: 2.1.0_Beta2~48^2^2~10
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=23f048d81269a7163fd217e565ba25025aca2c2f;p=casparcg

Merge commit '008e8dd2152b97abaf2b6c4f9ac385eb1e1d1d6e' into 2.1.0
---

23f048d81269a7163fd217e565ba25025aca2c2f