typo
Merge branch 'require-shim'