With changes, as sent to OMG
Merge branch 'master' of https://github.com/omg-threat-modeling/phase1