Incorporate changes from Nginx plugin