Merge pull request #1302 from martin-frbg/nofortran-fix