Matthew Smith - 2011-04-20

I have added patch 3290509 to implement this.