pspp
11 years agoUpdate required GTK version from 2.x to 3.x
John Darrington [Mon, 27 May 2013 08:40:14 +0000 (10:40 +0200)]
Update required GTK version from 2.x to 3.x

11 years agoPsppireOutputWindow: Draw the entire page instead of just the exposed area.
John Darrington [Tue, 28 May 2013 17:35:01 +0000 (19:35 +0200)]
PsppireOutputWindow: Draw the entire page instead of just the exposed area.

Gtk3 doesn't require (or provide the necessary information for) the drawn
widget to be cliped to the exposed area.  So this change removes the clip
from the expose callback of the PsppireOutputWindow.  It also removes some
functions which are now not necessary.

11 years agoPsppSheetView: Update the whole widget on expose not just the exposed bits.
John Darrington [Tue, 28 May 2013 05:42:22 +0000 (07:42 +0200)]
PsppSheetView: Update the whole widget on expose not just the exposed bits.

This makes things easier to port to Gtk3 (hopefully).

11 years agoRemove expose optimisation which is moot in Gtk3
John Darrington [Mon, 27 May 2013 20:04:40 +0000 (22:04 +0200)]
Remove expose optimisation which is moot in Gtk3

11 years agoUse cairo_t instead of GdkEvent->Window
John Darrington [Mon, 27 May 2013 18:53:37 +0000 (20:53 +0200)]
Use cairo_t instead of GdkEvent->Window

11 years agoTemporarily disable unused rubber banding feature
John Darrington [Mon, 27 May 2013 18:04:43 +0000 (20:04 +0200)]
Temporarily disable unused rubber banding feature

So far as I can see, we don't use this feature and it is a pain to
port.

11 years agoTemporarily remove optimisation in expose callback.
John Darrington [Mon, 27 May 2013 18:02:50 +0000 (20:02 +0200)]
Temporarily remove optimisation in expose callback.

I think this will be easier to manager after everything has been ported

11 years agoPsppSheetView: Remove calls to gdk_window_set_back_pixmap
John Darrington [Mon, 27 May 2013 17:19:46 +0000 (19:19 +0200)]
PsppSheetView: Remove calls to gdk_window_set_back_pixmap

This function is gone in Gtk3 and so far as I can tell it is
superfluous here.

11 years agoPsppSheetView: Avoid using GdkRegion
John Darrington [Mon, 27 May 2013 16:58:55 +0000 (18:58 +0200)]
PsppSheetView: Avoid using GdkRegion

11 years agoIncluded gdkkeysyms-compat.h where necessary
John Darrington [Mon, 27 May 2013 08:55:49 +0000 (10:55 +0200)]
Included gdkkeysyms-compat.h where necessary

11 years agoPsppSheetView: Temporarily avoid drag begin
John Darrington [Mon, 27 May 2013 14:59:57 +0000 (16:59 +0200)]
PsppSheetView: Temporarily avoid drag begin

11 years agoPsppSheetViewColumn: Avoid name conflict with Gtk3 standard headers
John Darrington [Mon, 27 May 2013 14:17:02 +0000 (16:17 +0200)]
PsppSheetViewColumn: Avoid name conflict with Gtk3 standard headers

11 years agoGtkXPaned: Remove xor_gc member.
John Darrington [Mon, 27 May 2013 10:23:18 +0000 (12:23 +0200)]
GtkXPaned: Remove xor_gc member.

This member was allocated and deallocated, but never used!

11 years agoPsppSheetView: Disable function pspp_sheet_view_create_row_drag_icon
John Darrington [Mon, 27 May 2013 08:47:53 +0000 (10:47 +0200)]
PsppSheetView: Disable function pspp_sheet_view_create_row_drag_icon

11 years agoMissing Value Dialog: Remove GTK_DIALOG_NO_SEPARATOR flag which does not exist in...
John Darrington [Mon, 27 May 2013 10:15:48 +0000 (12:15 +0200)]
Missing Value Dialog: Remove GTK_DIALOG_NO_SEPARATOR flag which does not exist in Gtk3

11 years agoReplace some instances of GdkDrawable with GdkWindow
John Darrington [Mon, 27 May 2013 10:32:46 +0000 (12:32 +0200)]
Replace some instances of GdkDrawable with GdkWindow

GdkDrawable is gone in Gtk3

11 years agoPsppireButtonBox: Remove dependence on flags deprecated in Gtk3
John Darrington [Mon, 27 May 2013 10:27:53 +0000 (12:27 +0200)]
PsppireButtonBox: Remove dependence on flags deprecated in Gtk3

11 years agoGtkXPaned: Replace GSEALed member access with the corresponding function calls
John Darrington [Mon, 27 May 2013 09:23:20 +0000 (11:23 +0200)]
GtkXPaned: Replace GSEALed member access with the corresponding function calls

11 years agoGtkXPaned: Avoid direct inclusion of gtk library header
John Darrington [Mon, 27 May 2013 08:52:37 +0000 (10:52 +0200)]
GtkXPaned: Avoid direct inclusion of gtk library header

11 years agogtk.h wrapper: Remove workarounds which are no longer required.
John Darrington [Mon, 27 May 2013 08:18:28 +0000 (10:18 +0200)]
gtk.h wrapper: Remove workarounds which are no longer required.

11 years agoDisable the remaining Gtk+2 features.
John Darrington [Mon, 27 May 2013 08:12:58 +0000 (10:12 +0200)]
Disable the remaining Gtk+2 features.

These do not seem easy to work around.  But none of them are
essential.  Postponing them till after the transition.

11 years agoPsppSheetViewColumn reparented to GObject
John Darrington [Mon, 27 May 2013 08:39:37 +0000 (10:39 +0200)]
PsppSheetViewColumn reparented to GObject

Previously the parent was GtkObject which no longer exists in Gtk3

11 years agoMore sealage
John Darrington [Sun, 26 May 2013 17:26:35 +0000 (19:26 +0200)]
More sealage

11 years agoSealage old_width
John Darrington [Sun, 26 May 2013 17:19:46 +0000 (19:19 +0200)]
Sealage old_width

11 years agoRename allocation -> col_allocation
John Darrington [Sun, 26 May 2013 17:10:12 +0000 (19:10 +0200)]
Rename allocation -> col_allocation

11 years agoMore sealage
John Darrington [Sun, 26 May 2013 16:39:52 +0000 (18:39 +0200)]
More sealage

11 years agoGet window
John Darrington [Sun, 26 May 2013 15:52:48 +0000 (17:52 +0200)]
Get window

11 years agoUse gtk_adjustment methods instead of direct access
John Darrington [Sun, 26 May 2013 15:09:15 +0000 (17:09 +0200)]
Use gtk_adjustment methods instead of direct access

11 years agoYet more sealage
John Darrington [Sun, 26 May 2013 14:03:30 +0000 (16:03 +0200)]
Yet more sealage

11 years agoTemporarily disable the splash screen
John Darrington [Sun, 26 May 2013 13:44:23 +0000 (15:44 +0200)]
Temporarily disable the splash screen

11 years agoYet more Gseal stuff
John Darrington [Sun, 26 May 2013 13:35:48 +0000 (15:35 +0200)]
Yet more Gseal stuff

11 years agoGtkSelectionData: only access using functions
John Darrington [Sun, 26 May 2013 13:28:51 +0000 (15:28 +0200)]
GtkSelectionData: only access using functions

11 years agoAvoid yet more sealed access
John Darrington [Sun, 26 May 2013 13:11:39 +0000 (15:11 +0200)]
Avoid yet more sealed access

11 years agoPsppireDataWindow : Avoid direct access to sealed widget members
John Darrington [Sun, 26 May 2013 12:17:39 +0000 (14:17 +0200)]
PsppireDataWindow : Avoid direct access to sealed widget members

11 years agoIndependent Samples dialog: Avoid direct access to sealed widget members
John Darrington [Sun, 26 May 2013 11:37:56 +0000 (13:37 +0200)]
Independent Samples dialog: Avoid direct access to sealed widget members

11 years agoMissing value dialog: Avoid access to sealed Gtk members
John Darrington [Sun, 26 May 2013 11:44:44 +0000 (13:44 +0200)]
Missing value dialog: Avoid access to sealed Gtk members

11 years agoAvoid direct access to sealed Gtk Widget members.
John Darrington [Sun, 26 May 2013 11:21:38 +0000 (13:21 +0200)]
Avoid direct access to sealed Gtk Widget members.

11 years agoText import dialog : Avoid deprecated Gtk functions
John Darrington [Sun, 26 May 2013 11:21:02 +0000 (13:21 +0200)]
Text import dialog : Avoid deprecated Gtk functions

11 years agoReplace GSEAL in widget headers by a different symbol
John Darrington [Sun, 26 May 2013 10:53:01 +0000 (12:53 +0200)]
Replace GSEAL in widget headers by a different symbol

We don't want our own data members to be sealed by Gtk

11 years agoDisable code which is not used and is Gtk3 unfriendly
John Darrington [Sun, 26 May 2013 10:23:48 +0000 (12:23 +0200)]
Disable code which is not used and is Gtk3 unfriendly

11 years agoRemove grid_line_gc
John Darrington [Sun, 26 May 2013 10:14:40 +0000 (12:14 +0200)]
Remove grid_line_gc

11 years agoAvoid use of gdk_draw_line
John Darrington [Sat, 25 May 2013 16:23:47 +0000 (18:23 +0200)]
Avoid use of gdk_draw_line

11 years agoAvoid use of deprecated GTK_SET_FLAGS
John Darrington [Fri, 24 May 2013 16:51:04 +0000 (18:51 +0200)]
Avoid use of deprecated GTK_SET_FLAGS

Based upon a patch from the Gtk+ project:

From: Emmanuele Bassi <ebassi@linux.intel.com>
Date: Mon, 12 Apr 2010 14:54:41 +0100
Subject: [PATCH] tree-view: Use gtk_widget_send_focus_change()

Remove the second (and last) internal user of the GTK_HAS_FOCUS flag.

https://bugzilla.gnome.org/show_bug.cgi?id=593671

11 years agoAvoid use of deprecated gdk_drawable_get_size
John Darrington [Mon, 20 May 2013 08:04:52 +0000 (10:04 +0200)]
Avoid use of deprecated gdk_drawable_get_size

Use gdk_window_get_{width,height} instead.  Some calls were completely unnecessary, so those
have simply been deleted.

11 years agoAvoid use of deprecated gdk_drawable_get_screen
John Darrington [Mon, 20 May 2013 07:47:47 +0000 (09:47 +0200)]
Avoid use of deprecated gdk_drawable_get_screen

11 years agoAvoid use of deprecated gdk_drawable_get_display
John Darrington [Mon, 20 May 2013 07:31:34 +0000 (09:31 +0200)]
Avoid use of deprecated gdk_drawable_get_display

11 years agoAvoid gdk_drawable_get_size which is now deprecated
John Darrington [Mon, 20 May 2013 05:17:23 +0000 (07:17 +0200)]
Avoid gdk_drawable_get_size which is now deprecated

11 years agoAvoid problems with G_CONST_RETURN
John Darrington [Mon, 20 May 2013 05:13:10 +0000 (07:13 +0200)]
Avoid problems with G_CONST_RETURN

This is no longer used by us.  But may be used by other 3rd party libraries.

11 years agoAvoid use of deprecated GtkComboBoxEntry
John Darrington [Mon, 20 May 2013 04:42:43 +0000 (06:42 +0200)]
Avoid use of deprecated GtkComboBoxEntry

11 years agoRecent GTK version to 2.24
John Darrington [Sun, 19 May 2013 10:11:18 +0000 (12:11 +0200)]
Recent GTK version to 2.24

11 years agoText Import Dialog: Fix initialisation of pages which had got broken 20130529010502/pspp 20130530010503/pspp 20130531010501/pspp 20130601010502/pspp 20130602010502/pspp 20130603010502/pspp 20130604010502/pspp 20130605010506/pspp 20130606010503/pspp
John Darrington [Tue, 28 May 2013 13:52:12 +0000 (15:52 +0200)]
Text Import Dialog: Fix initialisation of pages which had got broken

11 years agomanual: REGRESSION and DESCRIPTIVES make temp transformations permanent. 20130528010507/pspp
Ben Pfaff [Tue, 28 May 2013 04:41:36 +0000 (21:41 -0700)]
manual: REGRESSION and DESCRIPTIVES make temp transformations permanent.

Ideally, this should not be the behavior, but it is better than the crash
we had before.

Suggested by John Darrington.

Bug #38787.
Bug #38786.

11 years agoINPUT PROGRAM: Avoid infinite loop for trivially empty input program.
Ben Pfaff [Tue, 28 May 2013 04:28:32 +0000 (21:28 -0700)]
INPUT PROGRAM: Avoid infinite loop for trivially empty input program.

Bug #38782.
Reported by John Darrington.

11 years agoAvoid letting data fields overflow in output and GUI. 20130527010502/pspp
Ben Pfaff [Sun, 26 May 2013 23:43:01 +0000 (16:43 -0700)]
Avoid letting data fields overflow in output and GUI.

When the output for data_out() is too big for the field width, it produces
output that consists of just asterisks: ******.  This is OK when the
output is really going into a fixed-width space, such as the output for
PRINT and WRITE.  But it is obnoxious if the output is going into PSPP
output or the GUI.  This commit introduces a new function that typically
does not do this, and starts using it in output and the GUI.

Bug #35829.
Reported by John Darrington.
Bug #30731.
Reported by lavila <la@jump23.com>.

11 years agoWhitespace changes only 20130526010502/pspp
John Darrington [Sun, 26 May 2013 06:42:23 +0000 (08:42 +0200)]
Whitespace changes only

11 years agoFix memory leak in error path of RECODE
John Darrington [Sun, 26 May 2013 05:11:08 +0000 (07:11 +0200)]
Fix memory leak in error path of RECODE

11 years agoFix memory leak in error path of LOGISTIC REGRESSION
John Darrington [Sun, 26 May 2013 05:00:02 +0000 (07:00 +0200)]
Fix memory leak in error path of LOGISTIC REGRESSION

11 years agoFix memory leak in LOGISTIC command
John Darrington [Sat, 25 May 2013 18:53:31 +0000 (20:53 +0200)]
Fix memory leak in LOGISTIC command

11 years agoFixed memory leak in examine command
John Darrington [Sat, 25 May 2013 18:43:45 +0000 (20:43 +0200)]
Fixed memory leak in examine command

11 years agoFix leak check in oneway command
John Darrington [Sat, 25 May 2013 18:37:14 +0000 (20:37 +0200)]
Fix leak check in oneway command

11 years agoRemove "slash" property from psppire_button_editable, which is not used
John Darrington [Sat, 25 May 2013 16:45:18 +0000 (18:45 +0200)]
Remove "slash" property from psppire_button_editable, which is not used

11 years agoLinear Regression Test: Provide more decimal places in test results.
John Darrington [Sat, 25 May 2013 11:06:49 +0000 (13:06 +0200)]
Linear Regression Test: Provide more decimal places in test results.

This test previously had only 2 decimal places displayed, which
limited its ability to detect numerical errors.  This change increases
the decimal places to 3.

The results for this test were checked against a pattern provided
by Olaf Nöhring.

11 years agoRegression: Use alternative formula for adjusted R-square
John Darrington [Sat, 25 May 2013 10:54:57 +0000 (12:54 +0200)]
Regression: Use alternative formula for adjusted R-square

This is the formula given in SPSS Statistical Algorithms Ed 20.

11 years agoCorrected the Degrees of Freedom in the Regression Coefficient Significance
John Darrington [Sat, 25 May 2013 10:00:12 +0000 (12:00 +0200)]
Corrected the Degrees of Freedom in the Regression Coefficient Significance

Reported and Tested by: Olaf Nöhring.

11 years agoOpen imported files in new data window instead of overwriting the old 20130525010502/pspp
John Darrington [Sat, 18 May 2013 15:08:23 +0000 (17:08 +0200)]
Open imported files in new data window instead of overwriting the old

11 years agoAdd hint paramater to Window Load method
John Darrington [Sat, 18 May 2013 14:36:16 +0000 (16:36 +0200)]
Add hint paramater to Window Load method

11 years agoSmake: Use glibtoolize instead of libtoolize, if it is available. 20130523010503/pspp 20130524010504/pspp
Ben Pfaff [Wed, 22 May 2013 03:32:27 +0000 (20:32 -0700)]
Smake: Use glibtoolize instead of libtoolize, if it is available.

Requested by Teppo Jussmäki <jussmaki@fastmail.fm>.
Tested by Teppo Jussmäki <jussmaki@fastmail.fm>.

11 years agoDELETE VARIABLES: Fix crash with FILTER. 20130521010504/pspp
Ben Pfaff [Tue, 21 May 2013 06:49:54 +0000 (23:49 -0700)]
DELETE VARIABLES: Fix crash with FILTER.

FILTER has the surprising property that it introduces a temporary
transformation, even if proc_make_temporary_transformations_permanent()
was previously called.  This causes a crash if the procedure implementation
really relies on there being no temporary transformations.

This commit fixes the problem in the procedures I was able to identify as
having it, adds a comment to proc_make_temporary_transformations_permanent()
to make it a little less likely to happen again, and adds a test
specifically to check for regression on DELETE VARIABLES.

Reported by John Darrington.
Bug #38843.

11 years agoREGRESSION: Avoid use-after-free error with TEMPORARY and SAVE.
Ben Pfaff [Tue, 21 May 2013 05:20:18 +0000 (22:20 -0700)]
REGRESSION: Avoid use-after-free error with TEMPORARY and SAVE.

This should fix the use-after-free error, although I am not sure whether it
makes REGRESSION do exactly what it should do.

Bug #38787.

11 years agoDESCRIPTIVES: Avoid use-after-free with TEMPORARY and Z scores.
Ben Pfaff [Tue, 21 May 2013 05:14:54 +0000 (22:14 -0700)]
DESCRIPTIVES: Avoid use-after-free with TEMPORARY and Z scores.

This is not an ideal fix, but it avoids the use-after-free error that we
have had until now.

Bug #38786.

11 years agoFLIP: Fix use-after-free and double frees with temporary transformations.
Ben Pfaff [Tue, 21 May 2013 05:54:31 +0000 (22:54 -0700)]
FLIP: Fix use-after-free and double frees with temporary transformations.

I originally thought this was a bug in FLIP, but it turned out that in
fact we just hadn't ever really tested
proc_make_temporary_transformations_permanent() properly with actual
transformations, and especially with adding a transformation after calling
proc_make_temporary_transformations_permanent().

The modified test should avoid regression for the bug.

Bug #38832.

11 years agoDESCRIPTIVES: Fix a pair of memory leaks.
Ben Pfaff [Tue, 21 May 2013 05:35:35 +0000 (22:35 -0700)]
DESCRIPTIVES: Fix a pair of memory leaks.

11 years agoWork around change in signature of the switch page callback in GtkNoteBook 20130520010502/pspp
John Darrington [Mon, 20 May 2013 07:30:52 +0000 (09:30 +0200)]
Work around change in signature of the switch page callback in GtkNoteBook

11 years agoFix constness problem in spreadsheet reader dialog
John Darrington [Mon, 20 May 2013 05:00:49 +0000 (07:00 +0200)]
Fix constness problem in spreadsheet reader dialog

11 years agoversion.c: Make the build date/time independent of locale and timezone
John Darrington [Sun, 19 May 2013 09:40:02 +0000 (11:40 +0200)]
version.c: Make the build date/time independent of locale and timezone

11 years agoRemove unused function 20130519010502/pspp
John Darrington [Sun, 19 May 2013 05:20:52 +0000 (07:20 +0200)]
Remove unused function

11 years agoImplement import dialog to import spreadsheet files.
John Darrington [Sat, 18 May 2013 17:06:55 +0000 (19:06 +0200)]
Implement import dialog to import spreadsheet files.

Reviewed-by: Ben Pfaff
11 years agoSort items in datasheets dropdown box. 20130518010502/pspp
John Darrington [Fri, 17 May 2013 14:24:31 +0000 (16:24 +0200)]
Sort items in datasheets dropdown box.

Before this change, the values in the data sheets dropdown
box appeared in a non-deterministic order (the order in
the underlying hash), which was inconvenient to users.
This change produces the values in sorted order.

Closes bug #38921

11 years agoDocumentation: Explain more emphatically that UPDATE/MATCH/ADD do not mutate input...
John Darrington [Fri, 17 May 2013 08:08:49 +0000 (10:08 +0200)]
Documentation: Explain more emphatically that UPDATE/MATCH/ADD do not mutate input files.

Closes bug #38682.

11 years agoCairo output: Add a bit of horizontal between table columns.
John Darrington [Fri, 17 May 2013 07:55:21 +0000 (09:55 +0200)]
Cairo output: Add a bit of horizontal between table columns.

Fixes bug #34798

11 years agoSpreadsheet Import Dialog: Implement reset button
John Darrington [Wed, 15 May 2013 17:09:11 +0000 (19:09 +0200)]
Spreadsheet Import Dialog: Implement reset button

11 years agoMerge remote branch 'origin/master' into import-gui
John Darrington [Wed, 15 May 2013 17:02:45 +0000 (19:02 +0200)]
Merge remote branch 'origin/master' into import-gui

Conflicts:
src/ui/gui/page-assistant.c

11 years agoImport Assistant: Fix broken reset buttons 20130516010511/pspp 20130517010504/pspp
John Darrington [Wed, 15 May 2013 17:00:37 +0000 (19:00 +0200)]
Import Assistant: Fix broken reset buttons

11 years agoImport Assistant: Fix broken reset buttons
John Darrington [Wed, 15 May 2013 16:55:29 +0000 (18:55 +0200)]
Import Assistant: Fix broken reset buttons

11 years agoMerge remote branch 'origin/master' into import-gui
John Darrington [Tue, 14 May 2013 17:05:20 +0000 (19:05 +0200)]
Merge remote branch 'origin/master' into import-gui

11 years agoAvoid use of deprecated GtkNotebookPage
John Darrington [Tue, 14 May 2013 11:00:37 +0000 (13:00 +0200)]
Avoid use of deprecated GtkNotebookPage

11 years agoPsppireButtonBox: Do not use the GtkBoxChild structure.
John Darrington [Tue, 14 May 2013 09:52:27 +0000 (11:52 +0200)]
PsppireButtonBox: Do not use the GtkBoxChild structure.

Avoid using Gtk features which are (soon to be) deprecated.

11 years agoMerge remote branch 'origin/master' into import-gui
John Darrington [Tue, 14 May 2013 04:46:57 +0000 (06:46 +0200)]
Merge remote branch 'origin/master' into import-gui

11 years agoPsppSheetViewColumn: Remove inappropriate #ifndef
John Darrington [Mon, 13 May 2013 17:10:29 +0000 (19:10 +0200)]
PsppSheetViewColumn: Remove inappropriate #ifndef

11 years agoReplaced some obsolete GTK symbols with the recommended modern ones
John Darrington [Mon, 13 May 2013 07:30:30 +0000 (09:30 +0200)]
Replaced some obsolete GTK symbols with the recommended modern ones

11 years agoGtkXPaned: Whitespace changes only
John Darrington [Mon, 13 May 2013 06:44:20 +0000 (08:44 +0200)]
GtkXPaned: Whitespace changes only

11 years agoAvoid compiler warning
John Darrington [Mon, 13 May 2013 07:29:25 +0000 (09:29 +0200)]
Avoid compiler warning

11 years agoUpdate INSTALL file
John Darrington [Sun, 12 May 2013 13:40:36 +0000 (15:40 +0200)]
Update INSTALL file

11 years agoUpdated localisations from translation-project.org 20130512010504/pspp 20130513010504/pspp
John Darrington [Sun, 12 May 2013 05:41:49 +0000 (07:41 +0200)]
Updated localisations from translation-project.org

11 years agoMerge branch 'master' into import-gui
John Darrington [Sat, 11 May 2013 07:39:08 +0000 (09:39 +0200)]
Merge branch 'master' into import-gui

11 years agoMade _xml_char_to_int less prone to crashing 20130511010510/pspp
John Darrington [Sat, 11 May 2013 07:31:12 +0000 (09:31 +0200)]
Made _xml_char_to_int less prone to crashing

11 years agoGnumeric Reader: Use symbolic value instead of literal integer
John Darrington [Sat, 11 May 2013 07:21:01 +0000 (09:21 +0200)]
Gnumeric Reader: Use symbolic value instead of literal integer

11 years agoMade _xml_char_to_int less prone to crashing
John Darrington [Sat, 11 May 2013 07:31:12 +0000 (09:31 +0200)]
Made _xml_char_to_int less prone to crashing

11 years agoGnumeric Reader: Use symbolic value instead of literal integer
John Darrington [Sat, 11 May 2013 07:21:01 +0000 (09:21 +0200)]
Gnumeric Reader: Use symbolic value instead of literal integer

11 years agoMerge remote branch 'origin/master' into import-gui
John Darrington [Sat, 11 May 2013 05:21:46 +0000 (07:21 +0200)]
Merge remote branch 'origin/master' into import-gui