merge in lmp-release history after reset to 6a46f3384b3f48e6ef77a83a5e058a47a2939a0d
tree: a379b52b3b615df5de87be16c099cd69ed1717a9
  1. client/
  2. include/
  3. server/