merge wip git-svn-id: https://unicode.org/repos/unicodetools/branches/srl@1004 13e8329f-0b23-4da4-9fe8-d0f6fe080806