Working draft 2
Merge branch 'master' of https://github.com/OASIS-XDI-Technical-Committee/xdi-spec-docbook