Merge branch 'master' into 'gtk3'

Most conflicts seemed to be simple enough. There were a lot of `append_text` to
`append` conversions for `Gtk::ComboBoxText`. The `PopUpCommon` class also saw
a lot of changes with non-trivial conflict resolutions.

rtgui/editorpanel.h

@@ -85,6 +85,9 @@ protected:
     Gtk::Button* navNext;
     Gtk::Button* navPrev;
 
+    class MonitorProfileSelector;
+    std::auto_ptr<MonitorProfileSelector> monitorProfile;
+
     ImageAreaPanel* iareapanel;
     PreviewHandler* previewHandler;
     PreviewHandler* beforePreviewHandler;   // for the before-after view