https://bugs.freedesktop.org/show_bug.cgi?id=89014
--- Comment #3 from Marek Olšák maraeo@gmail.com --- Created attachment 113243 --> https://bugs.freedesktop.org/attachment.cgi?id=113243&action=edit patch 2
Can you try these patches? Patch 1 is there only to avoid merge conflicts.