Merge master.

diff --combined src/wx/kdm_dialog.cc
index 4975146ec87a998e5c6fa2ccbe0f3a8e6103e1c5,ebecd234c871894320c657edc996046eeabc8701..4334fd446ce99ae7dad7665fc4dc471072f2903c
--- 1/src/wx/kdm_dialog.cc
--- 2/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@@ -161,10 -161,10 +161,10 @@@ KDMDialog::KDMDialog (wxWindow* parent
  
        add_label_to_sizer (table, this, _("KDM type"), true);
        _type = new wxChoice (this, wxID_ANY);
 -      _type->Append ("Modified Transitional 1", ((void *) libdcp::KDM::MODIFIED_TRANSITIONAL_1));
 +      _type->Append ("Modified Transitional 1", ((void *) dcp::MODIFIED_TRANSITIONAL_1));
        if (!film->interop ()) {
 -              _type->Append ("DCI Any", ((void *) libdcp::KDM::DCI_ANY));
 -              _type->Append ("DCI Specific", ((void *) libdcp::KDM::DCI_SPECIFIC));
 +              _type->Append ("DCI Any", ((void *) dcp::DCI_ANY));
 +              _type->Append ("DCI Specific", ((void *) dcp::DCI_SPECIFIC));
        }
        table->Add (_type, 1, wxEXPAND);
        _type->SetSelection (0);
@@@ -490,10 -490,10 +490,10 @@@ KDMDialog::write_to () cons
        return _write_to->GetValue ();
  }
  
 -libdcp::KDM::Formulation
 +dcp::Formulation
  KDMDialog::formulation () const
  {
-       return (dcp::Formulation) reinterpret_cast<long int> (_type->GetClientData (_type->GetSelection()));
 -      return (libdcp::KDM::Formulation) reinterpret_cast<intptr_t> (_type->GetClientData (_type->GetSelection()));
++      return (dcp::Formulation) reinterpret_cast<intptr_t> (_type->GetClientData (_type->GetSelection()));
  }
  
  void