Merge pull request #2948 from martin-frbg/issue2947