Merge pull request #492 from FrozenNode/dev

Merge 4.10.0 into master