Imported Upstream version 1.15