Merge pull request #315 from FrozenNode/dev

Merge 4.6.1 into master