Merge remote-tracking branch 'atom/master'
authorkokdemo <kokdemo@gmail.com>
Sun, 11 Oct 2015 14:28:44 +0000 (22:28 +0800)
committerkokdemo <kokdemo@gmail.com>
Sun, 11 Oct 2015 14:28:44 +0000 (22:28 +0800)

Trivial merge