Update to 3.6