Only one registration format as per draft 15
Merge branch 'master'