Merge branch 'Celthi-youku_bugfix'
authorYen Chi Hsuan <yan12125@gmail.com>
Sat, 12 Dec 2015 07:26:43 +0000 (15:26 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sat, 12 Dec 2015 07:26:43 +0000 (15:26 +0800)

Trivial merge