Merge "Plug some leaks"
tree: a220de8a544047550cd90dba000432b242bc0812
  1. client/
  2. include/
  3. server/