Typo fix
Merge branch 'master' into dev-opcode-caching