Merge branch 'mutantmonkey-kusi'
authorYen Chi Hsuan <yan12125@gmail.com>
Fri, 4 Mar 2016 15:21:24 +0000 (23:21 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Fri, 4 Mar 2016 15:21:24 +0000 (23:21 +0800)

Trivial merge