am 6d874d2: Merge change 993 into donut

Merge commit '6d874d2bda563ada1034d2b3219b35d800fc6860'

* commit '6d874d2bda563ada1034d2b3219b35d800fc6860':
  Pull fix from master branch, and correct filename juggling.