Update for v0.6.0 from rev f18815e