Merge pull request #4055 from atom/backport-1500713003
authorCheng Zhao <zcbenz@gmail.com>
Mon, 11 Jan 2016 05:24:55 +0000 (13:24 +0800)
committerCheng Zhao <zcbenz@gmail.com>
Mon, 11 Jan 2016 05:24:55 +0000 (13:24 +0800)
Backport https://codereview.chromium.org/1500713003


Trivial merge