Bundle: Patch to fix #1077

Currently unplugged from my workstation. This is a patch to fix issues reported at #1077.