Based on the work started in https://github.com/ansible/ansible-documentation/pull/1219 - - Apply relevant changes to the current devel branch (a rebase would likely cause more problems).
