Updated to upstream (1.6.2)