Merge pull request #9 from electron/master
authorHeilig Benedek <benecene@gmail.com>
Fri, 3 Jun 2016 13:35:12 +0000 (15:35 +0200)
committerHeilig Benedek <benecene@gmail.com>
Fri, 3 Jun 2016 13:35:12 +0000 (15:35 +0200)
update as upstream


Trivial merge