follow up from review
Merge branch 'restdoc-discussions' of https://github.com/sathomas/Hilary into restdoc