Imported Upstream version 0.9.9.4