Merge branch '1.0' into 1.0-seek

diff --cc src/lib/audio_content.cc
index de743571bf218b7e747b7792b46a057aa0965918,b4c4f34b6f064aaa71e822869728e266c488bdf0..83a43f3bd2eae6ee48a54594adf313403dca8df2
--- 1/src/lib/audio_content.cc
--- 2/src/lib/audio_content.cc
+++ b/src/lib/audio_content.cc
@@@ -39,10 -40,10 +40,10 @@@ int const AudioContentProperty::AUDIO_G
  int const AudioContentProperty::AUDIO_DELAY = 204;
  int const AudioContentProperty::AUDIO_MAPPING = 205;
  
 -AudioContent::AudioContent (shared_ptr<const Film> f, Time s)
 +AudioContent::AudioContent (shared_ptr<const Film> f, DCPTime s)
        : Content (f, s)
        , _audio_gain (0)
-       , _audio_delay (0)
+       , _audio_delay (Config::instance()->default_audio_delay ())
  {
  
  }