Imported Upstream version 1.4.17