Merge remote-tracking branch 'refs/remotes/atom/master'
authorPlusb Preco <plusb21@gmail.com>
Thu, 29 Oct 2015 05:23:21 +0000 (14:23 +0900)
committerPlusb Preco <plusb21@gmail.com>
Thu, 29 Oct 2015 05:23:21 +0000 (14:23 +0900)

Trivial merge