Review eliotb's pull request #23
Description
Check what bits of that pull request are useful, which have been implemented already in the meantime and what can be merged verbatim.
{{ message }}
Check what bits of that pull request are useful, which have been implemented already in the meantime and what can be merged verbatim.