Reverted to old rebar.
Merge branch 'test' into dev