Various minor improvements to efficiency
Remove an unnecessary cast
Merge branch 'master' of ssh://origin
Merge branch 'master' of ssh://origin