Master 1.2 develop merge

I think this is okay @j-mutter ... wanna check?

cc @abecevello