I'm not sure if this should go in master or core-updates.
What do you think?

    Mark