[X2Go-Dev] Bug#789: Merging this with #625