Adding upstream version 0.6.0.