Refs#509. Merge branch 'grisuthedragon-develop' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Wed, 25 Feb 2015 17:44:19 +0000 (01:44 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Wed, 25 Feb 2015 17:44:19 +0000 (01:44 +0800)

Trivial merge