Merge pull request #2212 from martin-frbg/nofort-nolib