Update for v1.3.1 from rev 4542fcc