Update for v0.5.1 from rev 502396c