Merge pull request #2342 from lewurm/mkbundlefix