Fix require
Merge branch 'master' into wiki-to-docs