Merge branch 'upstream' into devel/x11