I've prepared first patch to be upstreamed: https://github.com/rebar/rebar/pull/589 Also, I have an idea how to reimplement second patch to send it to upstream.