merge in master-release history after reset to ec00884cac216d1cb79556ca23b21ce55e35af3e
tree: a14c399765f8468f61604361f3c7cfe01579e7dd
  1. client/
  2. include/
  3. server/