always listen for modules event
Merge branch 'master' into gh-pages
bundle