Merge branch 'develop' v0.2.19
authorZhang Xianyi <traits.zhang@gmail.com>
Thu, 1 Sep 2016 03:58:42 +0000 (23:58 -0400)
committerZhang Xianyi <traits.zhang@gmail.com>
Thu, 1 Sep 2016 03:58:42 +0000 (23:58 -0400)

Trivial merge