Merge pull request #3091 from martin-frbg/lapack477-2