Re-creates @marcus-herrmann's PR from wai-tutorials repository
wai-tutorials
Related to https://github.com/w3c/wai-website/issues/620