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