manual merge f3af740bdfc261b1cb25c0799af780d3753d4518

Merge commit 'f3af740bdfc261b1cb25c0799af780d3753d4518'
tree: f0e5c7c11324a09e68e8d626094bfd7e382063de
  1. include/
  2. media/