Update to 3.6.2, taken from MC