Added by mikael about 4 years ago
Merge remote-tracking branch 'upstream/master' into mikael_glsp_ilog_export