Merge remote-tracking branch 'atom/master'
authorPlusb Preco <plusb21@gmail.com>
Mon, 31 Aug 2015 00:55:35 +0000 (09:55 +0900)
committerPlusb Preco <plusb21@gmail.com>
Mon, 31 Aug 2015 00:55:35 +0000 (09:55 +0900)

Trivial merge