Updated after block vote part 1 on 10-17
Submitted to HL7 HQ
Merge branch 'master' of https://github.com/cqframework/OneModel