Merge branch 'hotfix-v0.2.8' v0.2.8
authorZhang Xianyi <traits.zhang@gmail.com>
Thu, 1 Aug 2013 15:53:12 +0000 (23:53 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Thu, 1 Aug 2013 15:53:12 +0000 (23:53 +0800)

Trivial merge