Merge pull request #533 from FrozenNode/dev

Merge 4.11.0 into master
Merge pull request #537 from FrozenNode/dev

Merge 4.11.1 into master
Merge pull request #539 from FrozenNode/dev

Merge 4.11.2 into master