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

Trivial merge