Merge branch 'develop' v0.2.18
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 12 Apr 2016 19:29:19 +0000 (15:29 -0400)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 12 Apr 2016 19:29:19 +0000 (15:29 -0400)

Trivial merge