Imported Upstream version 0.40