Latest nginx fixes from upstream