Adding upstream version 3.0.1.