Submitted by maintainer Damien Couderc <couderc.damien@wanadoo.fr>, with additional work by yours truly.