Merge pull request #1594 from martin-frbg/issue1593