Merge branch 'PeterDing-iqiyi'
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 6 Jun 2015 18:59:27 +0000 (02:59 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 6 Jun 2015 18:59:27 +0000 (02:59 +0800)

Trivial merge