Update for v1.3.2 from rev 58bc8cc