Imported Upstream version 3.05