Imported Upstream version 1.1.20rev1