Update to upstream version 1.16