Merged master branch, resolved EMath conflict