[X2Go-Dev] Processed: merging 1523 1524