Update for v0.5.3 from rev 57a7af9