Imported Upstream version 1.99