Update erlang.mk
Merge branch 'master' into next
Merge branch 'master' into pu-jj1bdx-work
Update README.md
Merge branch 'pu-jj1bdx-work' into next