Merge remote-tracking branch 'refs/remotes/electron/master'
authorPlusb Preco <plusb21@gmail.com>
Mon, 2 May 2016 01:18:25 +0000 (10:18 +0900)
committerPlusb Preco <plusb21@gmail.com>
Mon, 2 May 2016 01:18:25 +0000 (10:18 +0900)

Trivial merge