This was confirmed to fix the problem on Launchpad.
(cherry picked from commit 5dca2e33)

Conflicts:

	modules/video_output/x11/glx.c