Improve performance of plugin-combo.js
Merge branch 'master' into gh-pages