this internet is so slow that I'll give it another try:
I can't pull/push because of the renaming of the translation branch,
but here are some patches with changes mainly to the extending
Hope you can apply them in some way, I will see into my git
configuration when I am back in Finland by the end of next week.