NicolasDorier Fix bundling
Latest commit 38d810c Aug 25, 2018