Merge branch 'utf16-bug-fix' into fontmetrics
authorPeter Golde <peter@golde.org>
Fri, 18 Mar 2016 19:08:06 +0000 (12:08 -0700)
committerPeter Golde <peter@golde.org>
Fri, 18 Mar 2016 19:08:06 +0000 (12:08 -0700)

Trivial merge