Update to 3.6.2, proposed by kwm