Merge pull request #2703 from akoeplinger/pupitetris-Bug-35635