Merge change I6cacaa0d into eclair

* changes:
  Hack to fix issue #2125365: Sports Trivia compatability with Eclair