am aa983388: Merge change 1932 into donut

Merge commit 'aa9833885d89d42a0cd0b4202485e67b63d51412'

* commit 'aa9833885d89d42a0cd0b4202485e67b63d51412':
  Qualify a type and add some explanatory comments.