Merge branch 'release-0.2.17'
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 21 Mar 2016 00:44:01 +0000 (20:44 -0400)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 21 Mar 2016 00:44:01 +0000 (20:44 -0400)

Trivial merge