Imported Upstream version 2.12