Fixed in latest push. Can we merge now?