v1.1.1 into master

Other ahead commits aren't needed ore were included in other commits so better and simpler to leave as is without merge