Merge pull request #13 from electron/master
authorHeilig Benedek <benecene@gmail.com>
Sun, 31 Jul 2016 03:19:43 +0000 (05:19 +0200)
committerGitHub <noreply@github.com>
Sun, 31 Jul 2016 03:19:43 +0000 (05:19 +0200)
update as upstream


Trivial merge