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

Trivial merge