Imported Upstream version 2.13