Patch in comment #66 for:
  FDO     #47266 / https://bugs.freedesktop.org/show_bug.cgi?id=47266
  Debian #666468 / http://bugs.debian.org/666468