PR: 32648 Submitted by: maintainer
PR: 20965 Submitted by: Stephane Legrand <stephane.legrand@bigfoot.com>