Fix the includes when compiling gtest.
Merge branch 'develop' into interlacedFluxes