Code

Imported upstream version 1.4.2.