Merge pull request #7319 from Menci/master
authorCheng Zhao <zcbenz@gmail.com>
Thu, 29 Sep 2016 08:42:30 +0000 (16:42 +0800)
committerGitHub <noreply@github.com>
Thu, 29 Sep 2016 08:42:30 +0000 (16:42 +0800)
Workaround for electron/electron#5050


Trivial merge