Merge branch 'xorg/maint' into xorg/master

Conflicts:
	core

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --cc core
index 8dd67de,cab6c1c..13cec5a
--- 1/core
--- 2/core
+++ b/core
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 8dd67de33d8b729b3ff0f5aae6de1dbad9f3f30d
 -Subproject commit cab6c1c15dfa75c04b433447e608edb59171c376
++Subproject commit 13cec5adcabc015959a87a75ef67cc354242a6bd