Merge 'master' into 'psppsheet'.

diff --cc src/ui/gui/compute-dialog.c
index 9ddb66d48e4fcc848cbf48eb4b95eaf2754d7114,30456a381889ebb3214ac154d7fad8f4a220e517..46f9fbe07837b15f0c08fc367d792ee9881b6868
--- 1/src/ui/gui/compute-dialog.c
--- 2/src/ui/gui/compute-dialog.c
+++ b/src/ui/gui/compute-dialog.c
@@@ -385,8 -405,12 +403,11 @@@ compute_dialog (PsppireDataWindow *de
    GtkWidget *expression =
        get_widget_assert (xml, "radio-button-expression-label");
  
+   GtkWidget *str_btn =
+       get_widget_assert (xml, "radio-button-string");
+ 
  
 -  g_object_get (de->data_editor, "var-store", &vs, NULL);
 -  g_object_get (vs, "dictionary", &scd.dict, NULL);
 +  g_object_get (de->data_editor, "dictionary", &scd.dict, NULL);
    scd.use_type = FALSE;
  
    g_signal_connect (expression, "toggled",

diff --cc src/ui/gui/recode-dialog.c
Simple merge

diff --cc src/ui/gui/t-test-paired-samples.c
Simple merge