Remove call to undefined CMake macro
Remove -std=f2003 flag from Fortran flags
Merge branch 'master' into release