Merge remote-tracking branch 'atom/master'
authorPlusb Preco <plusb21@gmail.com>
Wed, 30 Sep 2015 02:01:08 +0000 (11:01 +0900)
committerPlusb Preco <plusb21@gmail.com>
Wed, 30 Sep 2015 02:01:08 +0000 (11:01 +0900)

Trivial merge