Merge pull request #311 from FrozenNode/dev

Merge 4.6.0 into master