Merge pull request #23 from google/chrome/m54
authorMatthew Leibowitz <mattleibow@live.com>
Tue, 13 Sep 2016 21:04:30 +0000 (23:04 +0200)
committerGitHub <noreply@github.com>
Tue, 13 Sep 2016 21:04:30 +0000 (23:04 +0200)
Cherry pick fix for skbug.com/5734 to M54


Trivial merge