Merge commit 'fe811d8bd0da15f14702968a9c7deb02db7eec9f' * commit 'fe811d8bd0da15f14702968a9c7deb02db7eec9f': quick fix; utf8_codepoint_count must be utf8_length
Merge commit 'fe811d8bd0da15f14702968a9c7deb02db7eec9f' * commit 'fe811d8bd0da15f14702968a9c7deb02db7eec9f': quick fix; utf8_codepoint_count must be utf8_length