am e67f0c97: (-s ours) Hack to fix issue #2125365: Sports Trivia compatability with Eclair (do not merge)

Merge commit 'e67f0c9712890f3af19d1213ff4c4b049c401226' into eclair

* commit 'e67f0c9712890f3af19d1213ff4c4b049c401226':
  Hack to fix issue #2125365: Sports Trivia compatability with Eclair (do not merge)