Backport #139 to current #140
This pull request has been generated by the canonical-doc-utilities backport command.
It has successfully cherry-picked individual commits from a different branch of this repository, which should merge without issue. It is advisable to check the changes only occur where you expect them!
The original PR this was ported from can be viewed here:#139