Merge pull request #2094 from martin-frbg/issue2066