Imported Upstream version 1.13