Merge branch 'master' of https://github.com/electron/electron into restore-issue
authorliusi <siyuan.liu@autodesk.com>
Mon, 25 Jul 2016 14:53:18 +0000 (22:53 +0800)
committerliusi <siyuan.liu@autodesk.com>
Mon, 25 Jul 2016 14:53:18 +0000 (22:53 +0800)

Trivial merge