From: Carl Hetherington <cth@carlh.net>
Date: Fri, 5 Feb 2016 09:59:53 +0000 (+0000)
Subject: Merge.
X-Git-Tag: v2.6.19~8
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=8f12ef26c5f6c0e9f408828b99ff8bdc90236406

Merge.
---

8f12ef26c5f6c0e9f408828b99ff8bdc90236406