Merge branch 'develop' v0.2.14
authorZhang Xianyi <traits.zhang@gmail.com>
Tue, 24 Mar 2015 20:07:07 +0000 (15:07 -0500)
committerZhang Xianyi <traits.zhang@gmail.com>
Tue, 24 Mar 2015 20:07:07 +0000 (15:07 -0500)

Trivial merge