Merge branch 'develop' into release-0.2.16
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 15 Mar 2016 17:56:01 +0000 (13:56 -0400)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 15 Mar 2016 17:56:01 +0000 (13:56 -0400)

Trivial merge