Bundle: Fixes for #1476.
Merge pull request #1502 from am11/master

Bundle: Fixes for #1476