Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

diff --cc ChangeLog
index b0a6819551594752d9a89e99042781f7572cf39d,450f31e49c9a1582ab4190ea75ad6573c8f872f9..76a1e2e127d455ad2fb54fce59832eae03226843
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,7 +1,12 @@@
 +2016-08-25  c.hetherington  <cth@carlh.net>
 +
 +      * Fix silent acceptance of certificate chains where
 +      single certificates are required (#937).
 +
  2016-08-25  Carl Hetherington  <cth@carlh.net>
  
+       * Make burnt-in subtitle outline width configurable (#940).
+ 
        * Updated nl_NL translation from Rob van Nieuwkerk.
  
  2016-08-24  Carl Hetherington  <cth@carlh.net>