Update to rig v0.6