Merge remote-tracking branch 'origin/master' into 2.0

diff --combined src/wx/about_dialog.cc
index 5ac732049a80880ef9fa1bd87f158ed28e5b1ff7,1aa7ef3e422fa19a2db0a084fdbace1a01febe0a..d14006ac5196c59a86126c08a74b390688d1807f
--- 1/src/wx/about_dialog.cc
--- 2/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@@ -1,5 -1,5 +1,5 @@@
  /*
 -    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
 +    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
  
      This program is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published by
@@@ -17,10 -17,6 +17,10 @@@
  
  */
  
 +/** @file  src/wx/about_dialog.cc
 + *  @brief The "about DCP-o-matic" dialogue box.
 + */
 +
  #include <wx/notebook.h>
  #include <wx/hyperlink.h>
  #include "lib/version.h"
@@@ -130,6 -126,7 +130,7 @@@ AboutDialog::AboutDialog (wxWindow* par
        supported_by.Add (wxT ("Andres Fink"));
        supported_by.Add (wxT ("Evan Freeze"));
        supported_by.Add (wxT ("Silvio Giuliano"));
+       supported_by.Add (wxT ("Alan Gouger"));
        supported_by.Add (wxT ("Flor Guillaume"));
        supported_by.Add (wxT ("Antonio Ruiz Hernandez"));
        supported_by.Add (wxT ("Jonathan Jensen"));
@@@ -221,10 -218,6 +222,10 @@@
        SetSizerAndFit (overall_sizer);
  }
  
 +/** Add a section of credits.
 + *  @param name Name of section.
 + *  @param credits List of names.
 + */
  void
  AboutDialog::add_section (wxString name, wxArrayString credits)
  {