am e117ff6: Merge change 860 into donut

Merge commit 'e117ff6e29df64b5945a4a242434f62abd117a9b'

* commit 'e117ff6e29df64b5945a4a242434f62abd117a9b':
  Change 79 in git master branch
tree: 2997ed550f85db9435caf51e85c658d793dd39be
  1. include/
  2. media/