Update to 3.6.1. Taken from MC.