Update to 1.31