Merging 1.1 to master

in 1.1 this was changed. lets see if the minimum versions are still ok now.