Merge remote-tracking branch 'atom/master'
authorGoooIce <devel0per@yeah.net>
Thu, 10 Sep 2015 06:27:16 +0000 (14:27 +0800)
committerGoooIce <devel0per@yeah.net>
Thu, 10 Sep 2015 06:27:16 +0000 (14:27 +0800)

Trivial merge