Merge remote-tracking branch 'trikolon/nginx' into next