Merge remote-tracking branch 'refs/remotes/atom/master'
authorPlusb Preco <plusb21@gmail.com>
Tue, 20 Oct 2015 15:26:30 +0000 (00:26 +0900)
committerPlusb Preco <plusb21@gmail.com>
Tue, 20 Oct 2015 15:26:30 +0000 (00:26 +0900)

Trivial merge