Pulled in the RGR968 fix from wxPi.