FYI, I've just pushed this: