Merge branch 'develop'
authorZhang Xianyi <traits.zhang@gmail.com>
Wed, 3 Dec 2014 15:01:33 +0000 (23:01 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Wed, 3 Dec 2014 15:01:33 +0000 (23:01 +0800)

Trivial merge