PR: 15120 Submitted by: Matt Behrens <matt@zigg.com>
PR: 7993, 8151 Submitted by: maintainer
Submitted by: "Matthew N. Dodd" <winter@jurai.net>