Merge "Fix issue #3037083: Problem report for Pinball" into gingerbread