Merge branch 'develop' v0.2.12
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 13 Oct 2014 09:10:41 +0000 (17:10 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 13 Oct 2014 09:10:41 +0000 (17:10 +0800)

Trivial merge