Imported Upstream version 2.6.16