Merging X11 fix from original repository.