Merge remote-tracking branch 'refs/remotes/atom/master'
authorPlusb Preco <plusb21@gmail.com>
Mon, 16 Nov 2015 14:55:46 +0000 (23:55 +0900)
committerPlusb Preco <plusb21@gmail.com>
Mon, 16 Nov 2015 14:55:46 +0000 (23:55 +0900)

Trivial merge