Imported Upstream version 2.15