Merge remote branch 'origin/master' into import-gui

Conflicts:
	src/data/casereader.c

diff --cc src/data/casereader.c
index 37adbb37d605c1399051fc98a84e433e6b90d1ee,adb6b6a909b134e815836aa75cbf0b1263d79b68..423a4dada271b432bef5ce8397f4f771b09e909a
--- 1/src/data/casereader.c
--- 2/src/data/casereader.c
+++ b/src/data/casereader.c
@@@ -244,7 -254,11 +254,10 @@@ casereader_count_cases__ (const struct 
  #if (__GNUC__ == 4 ) && (__GNUC_MINOR__ == 4)
    volatile int x = 1; x++;
  #endif
+ 
+   clone = casereader_clone (reader);
+   n_cases = casereader_advance (clone, max_cases);
    casereader_destroy (clone);
 -
    return n_cases;
  }