Update erlang.mk
Merge branch 'master' into next