Merge branch 'PeterDing-bilibili'
authorYen Chi Hsuan <yan12125@gmail.com>
Mon, 5 Sep 2016 05:55:07 +0000 (13:55 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Mon, 5 Sep 2016 05:55:07 +0000 (13:55 +0800)

Trivial merge