I'll fix this, solve conflicts and merge it in ;-)