I don't care about changing things too much, just want to have 1.3 out ASAP.
I'll merge this pull request, maybe make some small change and then we can start again from there :)