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/history.cc

@@ -224,8 +224,8 @@ void History::bookmarkSelectionChanged ()
 void History::procParamsChanged (ProcParams* params, ProcEvent ev, Glib::ustring descr, ParamsEdited* paramsEdited)
 {
 
-    // to prevent recursion, we filter out the events triggered by the history
-    if (ev == EvHistoryBrowsed) {
+    // to prevent recursion, we filter out the events triggered by the history and events that should not be registered
+    if (ev == EvHistoryBrowsed || ev == EvMonitorTransform) {
         return;
     }