Merge 'master' into 'psppsheet'.

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

diff --cc src/ui/gui/pspp-sheet-view.c
Simple merge

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

diff --cc src/ui/gui/split-file-dialog.c
index 82ef6315456bd1f9e3f2c6451cd303d2308c6ca1,e57075e2c602ea3c95d42de1c1bcb85e09473c04..2cf10d532945d837965b4861a837ec3a86e5f39d
--- 1/src/ui/gui/split-file-dialog.c
--- 2/src/ui/gui/split-file-dialog.c
+++ b/src/ui/gui/split-file-dialog.c
@@@ -177,9 -181,11 +177,9 @@@ split_file_dialog (PsppireDataWindow *d
  
    sfd.tv = GTK_TREE_VIEW (get_widget_assert (sfd.xml, "split-file-grouping-vars"));
  
 -  g_object_get (de->data_editor, "var-store", &vs, NULL);
 -
 -  g_object_get (vs, "dictionary", &sfd.dict, NULL);
 +  g_object_get (de->data_editor, "dictionary", &sfd.dict, NULL);
  
-   sfd.selector = PSPPIRE_SELECTOR (get_widget_assert (sfd.xml, "split-file-selector"));
+   sfd.selector = PSPPIRE_SELECTOR (selector);
  
    g_object_set (source, "model", sfd.dict, NULL);