x11: sync with upstream devel project

Change-Id: I5c52c03fbcc4f9d698bf7342511c7230c4370f14
Signed-off-by: Stephane Desneux <stephane.desneux@open.eurogiciel.org>