@pelson put this in his commit, I would prefer not to pick sections of the commit out (especially as these changes are few)