(cherry picked from commit 954fb5ea0a0356c3c3d1ebf1279b77b0d8cc14a0)

Conflicts:

	modules/access/screen/xcb.c