Update for v1.3.0 from rev a0f0faf