Proof-of-concept for Issue 170.
Looks good!
I'm going to merge this manually to save you the rebase :)
Commit f24cf3ce fixes this pull-request
Pull-Request has been merged by pingou
Proof-of-concept for Issue 170.