error types
Sync with ARIA 1.1 spec
auto-merge staging into master