Imported Upstream version 3.1