Comment 22 for bug 1641238

Created attachment 36048
Patch for trunkthat works for me (based on Yann one)