Merge change 993 into donut

* changes:
  Pull fix from master branch, and correct filename juggling.