I like to always add a trailing `,` to lists as it makes them less noisy to extend.

Don't bother changing this now as it will make @amercader have to do more work.  Also 2.1 requests should be as minimal as possible so the docstrings could have been just for master.

No worries I'm merging this and sending an email