gregor herrmann - 2014-05-07

And here's a patch from Vincent Fourmond.