Merged Master

Merged master into the tests branch, one conflict in the CMakeLists file from when the 3DSMax plugin was made optional.