Adding upstream version 4.0~a1.