Bundle: Patch to fix #1077.
Merge pull request #1117 from am11/patch-1

Bundle: Patch to fix #1077