Merge stuff from Linux development servers