Merge remote-tracking branch 'atom/master'
authorPlusb Preco <plusb21@gmail.com>
Tue, 25 Aug 2015 12:56:37 +0000 (21:56 +0900)
committerPlusb Preco <plusb21@gmail.com>
Tue, 25 Aug 2015 12:56:37 +0000 (21:56 +0900)

Trivial merge