Update to 3.6.0