Looks reasonable to me, merge on!
Thanks for the review :)
rebased
Pull-Request has been merged by pingou