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

diff --cc ChangeLog
index f6f3bc83ac0b64eeac69be18d2d40b33747a18fb,c57730218e331a2b4e2a5826094b0d894d97cfcc..1f230c1341213003a3a1e3b1ed191fad8f910597
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,11 @@@
+ 2016-06-13  Carl Hetherington  <cth@carlh.net>
+ 
+       * Give better error messages when subtitles fail to load.
+ 
  2016-06-13  c.hetherington  <cth@carlh.net>
  
 +      * Add 3D video frame type for 3D DCP inputs (#806).
 +
        * Add button to move things to the start of reels (#798).
  
  2016-06-08  Carl Hetherington  <cth@carlh.net>