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