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