Merge branch 'rebar-config-gh41'