This patch was approved a while ago, but i'm only checking it in now.

Here's what i committed.

Luis