Merge branch 'drops' into HEAD

Change-Id: Ia785f7c867db52797ce0c8e31601881f149d6125
tree: 52e15156034f359a4f66505b3b13d7f260161f90
  1. Changelog
  2. LICENSE
  3. README
  4. build/
  5. client/
  6. makefile
  7. server/