Merge branch 'TimothyGu-develop' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Mon, 19 May 2014 02:37:20 +0000 (10:37 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Mon, 19 May 2014 02:37:20 +0000 (10:37 +0800)

Trivial merge