Submitted by: Matt Peterson <matt@peterson.org> PR: 60768
Submitted by: Massimiliano della Rovere <mader@tiscalinet.it>