This was pushed in on #54 I believe