Updated to upstream 2.16.2.