Merge branch 'develop' v0.2.13
authorZhang Xianyi <traits.zhang@gmail.com>
Wed, 3 Dec 2014 15:14:21 +0000 (23:14 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Wed, 3 Dec 2014 15:14:21 +0000 (23:14 +0800)

Trivial merge