Update to 3.1.8