this conflicts with current master, but it's easy to resolve; no need to do it yourself, I can do it.