CFG: merge Eric's new patch sheet, regenerate gl_server layout file