I've split this out into a separate commit.  Though I've left the two updates in the same file.  The reason for this is that both bits of the patch are associated with adding a single piece of behaviour.  I thought keeping all this stuff together would make it clearer why it's here and make it easier for us to remove it later.