rebased onto 8bacd4da4fa6de578b818aa7a4b36bbeaaa243d7
Reviewed with @pingou changes make sense to me
fedora-rpms-py3 is passing, it fails on fedora-pip-py3 but this is unrelated to this PR, so I'm going to merge this :)
Thanks for the review @jrichardson !
Pull-Request has been merged by pingou
:thumbsup: