This includes !1819 (merged) and works around an application issue : https://bugs.freedesktop.org/show_bug.cgi?id=111522
