merge from open-source master
tree: ae9843aec82f873b439d0993074b65b323e4e383
  1. cmds/
  2. include/
  3. media/