Add MSVC 2013 support; Fix CMake regressions upstream