Merge branch 'rrooij-gamekings_fix'