Upstream: Update to grep-2.16