Merge branch 'rrooij-gamekings_fix'
authorYen Chi Hsuan <yan12125@gmail.com>
Sun, 31 Jan 2016 18:21:02 +0000 (02:21 +0800)
committerYen Chi Hsuan <yan12125@gmail.com>
Sun, 31 Jan 2016 18:21:02 +0000 (02:21 +0800)

Trivial merge