Attempt to resolve automerge problem...revert to what's now in master...
Attempt to resolve automerge problem...re-add unit tests for ARIA-specific additions...