Hotfix 1.1.1

Lightly tested but everything seems to work as well as and better than before. Considering I only really merged code fixes and improvements from 1.7.7 it's pretty stable.