Models branch for 1.2

I used my own fork because I had to rebase the branch for current master, there was a merge conflict... so the models branch in the main repository can safely be deleted after this is merged.