Merge master.

diff --cc src/lib/film.cc
Simple merge

diff --cc src/lib/film.h
Simple merge

diff --cc src/lib/make_dcp_job.cc
index a8b80fd67ba7c059cc15be467566db02b968fd7e,5272d6badf59b341d8ed1d2a851b207ab03d9806..e42018ad5875b962a1ad07fafcfbc8bbed6b55c7
--- 1/src/lib/make_dcp_job.cc
--- 2/src/lib/make_dcp_job.cc
+++ b/src/lib/make_dcp_job.cc
@@@ -132,8 -131,7 +132,8 @@@ MakeDCPJob::run (
                                &dcp.Progress,
                                dfr.frames_per_second,
                                frames,
-                               _film->audio_channels(),
 -                              dcp_audio_channels (_film->audio_channels())
++                              dcp_audio_channels (_film->audio_channels()),
 +                              _film->encrypted()
                                )
                        );
                ascend ();

diff --cc src/lib/util.cc
Simple merge

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