Imported upstream version 2.1.