Merge pull request #172 from alexander-zimmermann/next

Small changes around fg_rpc_server.[h|c]