Update erlang.mk to the latest master branch
Merge branch 'next' for updating erlang.mk