This looks good to me - but of course, the final say is with the 
commiters :)

- Juli