Merge branch 'develop' v0.2.9
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 10 Jun 2014 13:55:47 +0000 (21:55 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 10 Jun 2014 13:55:47 +0000 (21:55 +0800)

Trivial merge