Merge branch 'master' into gh-pages
fix passing back injected function
Merge branch 'gh-pages'