Fixed CMakeLists install target on Linux.
Merge branch 'master' into develop

This pulls in some changes I made to the CMakeLists file earlier.