Merge branch 'develop' upstream/0.2.20 v0.2.20
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 24 Jul 2017 04:03:35 +0000 (12:03 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 24 Jul 2017 04:03:35 +0000 (12:03 +0800)
0.2.20 version


Trivial merge