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

Trivial merge