+ merged: changes from https://github.com/h5bp/server-configs-nginx