Merge from upstream; bump version to 0.6.0.