PR: 36306 Submitted by: the former maintainer
PR: 26289 Submitted by: Alex Kapranoff <kapr@crosswinds.net>