Good one :)
Looks fine to me, let's rebase and merge :)
rebased
Pull-Request has been merged by pingou