Imported Upstream version 2.14