Sync with public repo for 1.1

[McHaillet]

I guess other commits from the main repo suddenly synced here as well. Good reason to switch to one repository in the future :)