Merge commit 'b50029ddb273c195ca108bebc43724b56f6c19e3' into axis-fix

diff --cc axisregistry/Lib/axisregistry/__init__.py
Simple merge

diff --cc axisregistry/Lib/axisregistry/data/element_grid.textproto
Simple merge

diff --cc axisregistry/Lib/axisregistry/data/element_shape.textproto
Simple merge

diff --cc axisregistry/Lib/axisregistry/data/flair.textproto
Simple merge

diff --cc axisregistry/tests/data/OpenSans-Italic[wdth,wght]_STAT.ttx
Simple merge

diff --cc axisregistry/tests/data/OpenSansCondensed-Italic[wght]_STAT.ttx
Simple merge

diff --cc axisregistry/tests/data/OpenSansCondensed[wght]_STAT.ttx
Simple merge

diff --cc axisregistry/tests/data/OpenSans[wdth,wght]_STAT.ttx
Simple merge

diff --cc axisregistry/tests/data/Wonky[wdth,wght]_STAT.ttx
Simple merge