am d3f14a62: reconcile donut snapshot

Merge commit 'd3f14a625e74a93e52b8b9aa5363a5de50129ea9'

* commit 'd3f14a625e74a93e52b8b9aa5363a5de50129ea9':
  donut snapshot
tree: fc13e8547ac0f13cf2f3c220b738a23033bbf32b
  1. include/
  2. media/