Merge master.

diff --cc ChangeLog
index 222a0eea15acdcf95e8a3407f9fbac80f21af7b8,f028d76f3a2a5f3e56ad6730f3b4b0c7aa78b6dd..65518b42bab72e50893d9e7dc899000381ad9914
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,18 -1,25 +1,38 @@@
+ 2014-09-16  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.73.7 released.
+ 
+ 2014-09-16  Carl Hetherington  <cth@carlh.net>
+ 
+       * Fix non-update of audio gain when changing selected content.
+ 
+ 2014-09-14  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.73.6 released.
+ 
+ 2014-09-14  Carl Hetherington  <cth@carlh.net>
+ 
+       * Version 1.73.5 released.
+ 
+ 2014-09-14  Carl Hetherington  <cth@carlh.net>
+ 
+       * Update to nl_NL translation from Cherif Ben Brahim.
+ 
  2014-09-12  Carl Hetherington  <cth@carlh.net>
  
 +      * Version 2.0.9 released.
 +
 +2014-09-12  Carl Hetherington  <cth@carlh.net>
 +
 +      * Add "re-examine" option to content context menu (#339).
 +
 +2014-09-11  Carl Hetherington  <cth@carlh.net>
 +
 +      * Restore encoding optimisations for still-image sources.
 +
 +      * Add option to re-make signing chain with specified organisation,
 +      common names etc. (#354)
 +
        * Allow separate X and Y scale for subtitles (#337).
  
  2014-09-10  Carl Hetherington  <cth@carlh.net>

diff --cc debian/changelog
index 8dc45469bb6e0408514087fce7bfc1ea067ce6d0,16e2e433a5946ab9b2b6d6ca1cc5445775b90558..c71a60422ab52f203e25232b7be235be1446fc67
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,186 -1,190 +1,8 @@@
 -dcpomatic (1.73.7-1) UNRELEASED; urgency=low
 +dcpomatic (2.0.9-1) UNRELEASED; urgency=low
  
    * New upstream release.
 -  * New upstream release.
 -  * New upstream release.
 -  * New upstream release.
 -  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
--  * New upstream release.
  
 - -- Carl Hetherington <carl@d1stkfactory>  Tue, 16 Sep 2014 21:19:53 +0100
 + -- Carl Hetherington <carl@d1stkfactory>  Fri, 12 Sep 2014 00:17:46 +0100
  
  dcpomatic (0.87-1) UNRELEASED; urgency=low
  

diff --cc src/lib/audio_decoder.cc
index 75619228635a845c2dd0d4680ea483a903e4e8e4,30bd2540a01ac361523fabc792dafe9ac1e27caa..f3251f306bf47284a71bc1d53917631e917c827b
--- 1/src/lib/audio_decoder.cc
--- 2/src/lib/audio_decoder.cc
+++ b/src/lib/audio_decoder.cc
@@@ -17,11 -17,12 +17,12 @@@
  
  */
  
+ #include <iostream>
  #include "audio_decoder.h"
  #include "audio_buffers.h"
 -#include "exceptions.h"
 -#include "log.h"
 +#include "audio_processor.h"
  #include "resampler.h"
 +#include "util.h"
  
  #include "i18n.h"
  

diff --cc src/wx/about_dialog.cc
Simple merge

diff --cc src/wx/wx_util.cc
Simple merge