Merge branch 'master' of https://github.com/harfbuzz/harfbuzz
authorRod Sheeter <rsheeter@google.com>
Fri, 16 Feb 2018 14:01:41 +0000 (06:01 -0800)
committerRod Sheeter <rsheeter@google.com>
Fri, 16 Feb 2018 14:01:41 +0000 (06:01 -0800)

Trivial merge