Adding upstream version 1.6.0.3.
