Imported Upstream version 3.2