Signed-off-by: James Vega <jamessan@users.sourceforge.net> (cherry picked from commit 41fd218b8d586c5a0fbab956f96cba1896d4231d) Signed-off-by: Daniel Folkinshteyn <nanotube@users.sourceforge.net>