Merge branch 'release-0.2.16' v0.2.16
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 15 Mar 2016 18:49:10 +0000 (14:49 -0400)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 15 Mar 2016 18:49:10 +0000 (14:49 -0400)

Trivial merge