Merge commit '0b03fa8b6f1bda3dd3fa7544dd16f88441ea6fad' * commit '0b03fa8b6f1bda3dd3fa7544dd16f88441ea6fad': Hack to fix issue #2125365: Sports Trivia compatability with Eclair
Merge commit '0b03fa8b6f1bda3dd3fa7544dd16f88441ea6fad' * commit '0b03fa8b6f1bda3dd3fa7544dd16f88441ea6fad': Hack to fix issue #2125365: Sports Trivia compatability with Eclair