Merge branch 'rebar-config-cleanup-for-master'