Imported Upstream version 1.3.9.99