Please merge into yours, review, then send me another pull to my master