Update to schema mapping with v1.1 merged in
Merge remote-tracking branch 'upstream/metadata-v-1.1' into gh-pages