Fixed #251. Merge branch 'grisuthedragon-develop' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Thu, 11 Jul 2013 13:41:44 +0000 (21:41 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Thu, 11 Jul 2013 13:42:04 +0000 (21:42 +0800)

Trivial merge