Imported Upstream version 2.20