Merged PR 264 for various bundler related bug fixes