Repo update timing version 2

This is an alternate to #4091 without the collation changes.

It should have the same effect on times, but the code for GetAddonVersion() is slightly more complex.

@MartijnKaijser, @sraue - would appreciate if you could run the same time tests as you did for #4091.  Should be about the same I think.