Update to 6.2 stable

Update master to 6.2 stable