Patch for r285.
Please do this for any issues - anything mentioned anywhere else is easily lost and forgotten, and often can't be investigated without all the details requested by the guidelines.